--- a/phoneengine/phonemodel/src/cpemessagehandler.cpp	Mon Jul 12 15:53:34 2010 +0100
+++ b/phoneengine/phonemodel/src/cpemessagehandler.cpp	Tue Aug 17 18:45:21 2010 +0100
@@ -2443,8 +2443,10 @@
         {
         iModel.SendMessage( MEngineMonitor::EPEMessageInValidEmergencyNumber );
         }
-
-    return errorCode;
+    // CPhCltEmergencyCall::IsEmergencyPhoneNumber can legitamately return an error code
+    // This simply means that the number is NOT an emergency number (eg it can return KErrArgument)
+    // Therefore we are ignoring any KErrArgument errors that come from this
+    return (errorCode == KErrArgument) ? ECCPErrorNone : errorCode;
     }
 
 // -----------------------------------------------------------------------------