--- a/calendarui/server/CalenSvr/src/CalSvrSession.cpp	Tue Feb 02 10:12:19 2010 +0200
+++ b/calendarui/server/CalenSvr/src/CalSvrSession.cpp	Fri Feb 19 22:49:53 2010 +0200
@@ -165,12 +165,16 @@
         TRACE_EXIT_POINT;
         return;
         }
-
-    Server()->UnregisterUserL(*this);
-    iRegistered = EFalse;
-
-    iInitMessage.Complete(KErrCancel);
-    iInitActive = EFalse;
+	if(iRegistered)
+    	{
+    	Server()->UnregisterUserL(*this);
+		iRegistered = EFalse;
+    	}
+	if(!iInitMessage.IsNull() )
+		{
+		iInitMessage.Complete(KErrCancel);
+        iInitActive = EFalse;
+		}
     
     TRACE_EXIT_POINT;
     }
@@ -231,6 +235,25 @@
     TRACE_EXIT_POINT;
     }
 
+
+// -----------------------------------------------------------------------------
+// ?classname::?member_function
+// ?implementation_description
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+//srinath
+void CCalSvrSession::HandleError()
+	{
+	TRACE_ENTRY_POINT;
+	
+	if(!iInitMessage.IsNull() )
+		{
+		iInitMessage.Complete(KErrNone);
+		}
+	
+	TRACE_EXIT_POINT;
+	}
+
 // -----------------------------------------------------------------------------
 // ?classname::?member_function
 // ?implementation_description