--- a/activityfw/storage/server/src/afstorageasynctask.cpp	Tue Jul 06 14:37:10 2010 +0300
+++ b/activityfw/storage/server/src/afstorageasynctask.cpp	Wed Aug 18 10:05:49 2010 +0300
@@ -19,8 +19,6 @@
 #include "afstorageasynctask.h"
 #include "afcmd.h"
 
-_LIT(KUnsupportedStorageAsyncTask, "Unsupported async storage task");
-
 // -----------------------------------------------------------------------------
 /**
  * Constructor for performing 1st stage construction
@@ -56,9 +54,7 @@
     self->ExecuteL(dataStorage, msg);
     taskStorage.PushL(self);
     CleanupStack::Pop(self);
-    if (EFalse == msg.IsNull()) {
-        msg.Complete(KErrNone);
-    }
+    msg.Complete(KErrNone);
 }
 
 // -----------------------------------------------------------------------------
@@ -100,9 +96,6 @@
     case ApplicationActivity:
         ApplicationActivityL(dataStorage, msg);
         break;
-    default:
-        //this code shouldn't be called. fatal error: means wrong session implementation 
-        User::Panic(KUnsupportedStorageAsyncTask, KErrGeneral);
     };
 }
 
@@ -166,12 +159,10 @@
  */
 void CAfStorageAsyncTask::WriteResponseL(const RMessage2& msg)
 {
-    if (EFalse == msg.IsNull()) {
-        msg.WriteL(1, 
-                   TPckgBuf<TInt>(mExternalizedData.Length()));//write data size
-        msg.WriteL(2, 
-                   TPckgBuf<CBase*>(this));//task identyfier
-    }
+    msg.WriteL(1, 
+               TPckgBuf<TInt>(mExternalizedData.Length()));//write data size
+    msg.WriteL(2, 
+               TPckgBuf<CBase*>(this));//task identyfier
 }
 
 // -----------------------------------------------------------------------------