--- a/uifw/AvKon/akncompamode/src/akncompakb.cpp	Wed Sep 15 12:29:17 2010 +0300
+++ b/uifw/AvKon/akncompamode/src/akncompakb.cpp	Wed Oct 13 14:50:15 2010 +0300
@@ -270,13 +270,11 @@
     // disabled whenever screen mode changes to compa-mode by AknCapServer.
     if (iFlags.iInAknCapSrv && iFlags.iEffectsDisa != aDisable)
         {
-        TInt err = KErrNone;
         if (iCompaSrvSession.Handle() == KNullHandle)
             {
-	        err = iCompaSrvSession.Connect();
+	        User::LeaveIfError( iCompaSrvSession.Connect() );
             }
-        
-        if (err == KErrNone && iCompaSrvSession.Handle() != KNullHandle)
+        if (iCompaSrvSession.Handle() != KNullHandle)
             {
             if (aDisable)
                 {