--- a/srsf/vcommandhandler/src/tagnameset.cpp	Wed Apr 14 15:58:44 2010 +0300
+++ b/srsf/vcommandhandler/src/tagnameset.cpp	Tue May 11 16:14:47 2010 +0300
@@ -178,7 +178,15 @@
             DecreaseCallbacksExpected();
             WaitUntilOperationsAreCompletedL();
             
-            User::Leave( nssErr );
+            switch( nssErr )
+                {
+                case MNssSpeechItem::EVasInvalidParameter:
+                    User::Leave( KErrArgument );
+                case MNssSpeechItem::EVasTrainFailed:
+                    User::Leave( KErrGeneral );
+                default:
+                    User::Leave( nssErr );
+                } 
             }        
         }
     RUBY_DEBUG0( "CTagNameSet::TrainTagL Tag training has been initiated" );