diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ds-command/ds-command.component.html b/projects/poweredsoft/ngx-cdk-ui/src/lib/ds-command/ds-command.component.html
index 0653c8f..b52232c 100644
--- a/projects/poweredsoft/ngx-cdk-ui/src/lib/ds-command/ds-command.component.html
+++ b/projects/poweredsoft/ngx-cdk-ui/src/lib/ds-command/ds-command.component.html
@@ -2,25 +2,24 @@
     <ng-container *ngIf="hasContent" [ngTemplateOutlet]="contentTemplate"
         [ngTemplateOutletContext]="{ $implicit: command, loading: isLoading }">
     </ng-container>
-</ng-container>
 
-<ng-container *ngIf="lastValidationResult">
-    <ng-container *ngIf="hasValidationTemplate" [ngTemplateOutlet]="validationTemplate"
-        [ngTemplateOutletContext]="{ $implicit: lastValidationResult }">
+    <ng-container *ngIf="lastValidationResult">
+        <ng-container *ngIf="hasValidationTemplate" [ngTemplateOutlet]="validationTemplate"
+            [ngTemplateOutletContext]="{ $implicit: lastValidationResult }">
+        </ng-container>
+    </ng-container>
+    
+    <ng-container *ngIf="lastErrorMessage && errorContent && errorContent.template">
+        <ng-container [ngTemplateOutlet]="errorContent.template"
+            [ngTemplateOutletContext]="{ $implicit: lastErrorMessage }">
+        </ng-container>
+    </ng-container>
+    
+    <ng-container *ngIf="hasFooterTemplate" [ngTemplateOutlet]="footerTemplate"
+        [ngTemplateOutletContext]="{ $implicit: command, loading: isLoading }">
     </ng-container>
 </ng-container>
 
-<ng-container *ngIf="lastErrorMessage && errorContent && errorContent.template">
-    <ng-container [ngTemplateOutlet]="errorContent.template"
-        [ngTemplateOutletContext]="{ $implicit: lastErrorMessage }">
-    </ng-container>
-</ng-container>
-
-<ng-container *ngIf="hasFooterTemplate" [ngTemplateOutlet]="footerTemplate"
-    [ngTemplateOutletContext]="{ $implicit: command, loading: isLoading }">
-</ng-container>
-
-
 
 <ng-template #noCommand>
     <ng-container *ngIf="noCommandContent && noCommandContent.template">
diff --git a/src/app/ds-command-demo/ds-command-demo-page/ds-command-demo-page.component.html b/src/app/ds-command-demo/ds-command-demo-page/ds-command-demo-page.component.html
index e7578ee..ed2f17d 100644
--- a/src/app/ds-command-demo/ds-command-demo-page/ds-command-demo-page.component.html
+++ b/src/app/ds-command-demo/ds-command-demo-page/ds-command-demo-page.component.html
@@ -1,3 +1,4 @@
+
 <ps-view [dataSource]="dataSource">
     <ng-container *psViewContent="let model">
         <div class="card">
@@ -16,8 +17,9 @@
 
             </div>
         </div>
-
+        
         <div class="card mt-2" *ngIf="formActivated">
+           
             <div class="card-body">
                 <ps-ds-command [dataSource]="dataSource" name="changePhone" (success)="onSuccess($event)"
                     [model]="model">
@@ -45,6 +47,16 @@
                         </ng-container>
                     </div>
 
+                    <ng-container *psDsCommandNoCommand>
+                        NO COMMAND
+                    </ng-container>
+
+                    <ng-container *psDsCommandError="let error;">
+                        <div class="alert alert-danger">
+                            {{error}}
+                        </div>
+                    </ng-container>
+
                     <ng-container *psDsCommandFooter="let command; let loading=loading">
                         <button class="btn btn-info" [disabled]="loading"
                             (click)="formActivated = false">Cancel</button>
diff --git a/src/app/ds-command-demo/ds-command-demo-page/ds-command-demo-page.component.ts b/src/app/ds-command-demo/ds-command-demo-page/ds-command-demo-page.component.ts
index fd59bd8..523dd4a 100644
--- a/src/app/ds-command-demo/ds-command-demo-page/ds-command-demo-page.component.ts
+++ b/src/app/ds-command-demo/ds-command-demo-page/ds-command-demo-page.component.ts
@@ -36,6 +36,12 @@ export class DsCommandDemoPageComponent implements OnInit {
     number: "514 448 8444"
   };
 
+  myCommand: ChangeContactPhone = {
+    contactId: 1,
+    number: null,
+    extension: null
+  }
+
   formActivated: boolean = false;
   dataSource: IDataSource<Contact>;
 
@@ -49,13 +55,21 @@ export class DsCommandDemoPageComponent implements OnInit {
           return throwError({
             status: 400,
             error: {
-                errors: {
+              errors: {
                 number: ['number is required']
               }
             }
           })
         }
 
+        if (command.extension == "hello")
+          return throwError({
+            status: 500,
+            error: {
+              message: "Error from server..."
+            }
+          })
+
         return of(command);
       }, e => {
         return of(<ChangeContactPhone>{