--- a/mtpfws/mtpfw/dataproviders/devdp/src/cmtpdevicedatastore.cpp	Tue Feb 02 01:11:40 2010 +0200
+++ b/mtpfws/mtpfw/dataproviders/devdp/src/cmtpdevicedatastore.cpp	Fri Mar 19 09:40:39 2010 +0200
@@ -875,7 +875,7 @@
     TInt errorCode = ValidateString(aDateTime, dateTime, offset);
     if(KErrNone == errorCode)
 	{
-	    StringToDateTime(dateTime);
+	    StringToDateTimeL(dateTime);
 	    iDateTime->SetL(dateTime);
 	    StoreL();
 	    //now set the system time by calling user SetUTCTime
@@ -923,7 +923,7 @@
 *TTime time format YYYYMMDD:hhmmss.ssssss. Right now microsecond part is
 * not implemented.
 **/
-void CMTPDeviceDataStore::StringToDateTime(TDes& aDateTime )
+void CMTPDeviceDataStore::StringToDateTimeL(TDes& aDateTime )
 	{
     __FLOG(_L8("StringToDateTime - Entry"));
 	TBuf<30> newTime;
@@ -956,8 +956,7 @@
 		}
 	else
 		{
-		_LIT(KPanic, "date time ");
-		User::Panic(KPanic, 3);
+        User::Leave( KErrArgument );
 		}
         __FLOG_1(_L("Processed DateTime: %S"), &aDateTime);	
 	__FLOG(_L8("StringToDateTime - Exit"));