--- a/activityfw/activityserviceplugin/src/afactivation.cpp	Mon Sep 27 11:31:59 2010 +0300
+++ b/activityfw/activityserviceplugin/src/afactivation.cpp	Wed Oct 06 16:00:22 2010 +0300
@@ -24,7 +24,10 @@
 {
     QSharedPointer<AfStorageProxy> connection(new AfStorageProxy());    
     QT_TRAP_THROWING(
-        User::LeaveIfError(connection->waitActivity());
+        if(!connection->waitActivity())
+        {
+            User::Leave(KErrGeneral);
+        }
     )
     
     d_ptr = new AfActivationPrivate(connection, this);