diff --git a/projects/poweredsoft/data/package.json b/projects/poweredsoft/data/package.json
index 0b3815a..5e783d9 100644
--- a/projects/poweredsoft/data/package.json
+++ b/projects/poweredsoft/data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@poweredsoft/data",
-  "version": "0.0.24",
+  "version": "0.0.25",
   "peerDependencies": {
     "rxjs": "^6.5.3"
   }
diff --git a/projects/poweredsoft/data/src/lib/DataSource.ts b/projects/poweredsoft/data/src/lib/DataSource.ts
index 84b5374..0d296ce 100644
--- a/projects/poweredsoft/data/src/lib/DataSource.ts
+++ b/projects/poweredsoft/data/src/lib/DataSource.ts
@@ -91,8 +91,11 @@ export class DataSource<TModel> implements IDataSource<TModel>
     }
 
     resolveCommandModelByName<T extends any>(event: IResolveCommandModelEvent<TModel>) : Observable<T> {
-        if (!this.options.transport.commands.hasOwnProperty(name))
-            return Observable.throw(`command with name ${name} not found`);
+        if (!this.options.transport.commands.hasOwnProperty(event.command))
+            return throwError(<IDataSourceErrorMessage>{
+                type: 'message',
+                message: `command with name ${event.command} not found`
+            });
 
         const commandOptions = this.options.transport.commands[event.command];
         if (commandOptions.resolveCommandModel)
@@ -104,7 +107,7 @@ export class DataSource<TModel> implements IDataSource<TModel>
 
     executeCommandByName<TCommand, TResult>(name: string, command: TCommand) : Observable<TResult> {
         if (!this.options.transport.commands.hasOwnProperty(name))
-            return Observable.throw(`command with name ${name} not found`);
+            return throwError(`command with name ${name} not found`);
 
         return this.options.transport.commands[name].adapter.handle(command).pipe(
             map(t => {