--- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmenstoretsy.cpp	Tue Sep 14 23:33:57 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmenstoretsy.cpp	Wed Sep 15 13:30:43 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -327,6 +327,8 @@
     if ( trapError != KErrNone )
         {
         // Complete with error if trap error
+		// Reset request handle to indicate the request is no longer ongoing
+        iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle );
         ReqCompleted( aTsyReqHandle, trapError );
         }
     else if ( ret != KErrNone )
@@ -334,21 +336,19 @@
         // Complete with error if return value error
         ReqCompleted( aTsyReqHandle, ret );
         }
-
-    // Save request handle
-    if ( EMultimodeENStoreReqHandleUnknown != iReqHandleType )
+    else if ( EMultimodeENStoreReqHandleUnknown != iReqHandleType )
         {
+        // Save request handle
 #ifdef REQHANDLE_TIMER
         SetTypeOfResponse( iReqHandleType, aTsyReqHandle );
 #else
         iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle );
 #endif
+        }
         // We've finished with this value now. Clear it so it doesn't leak
         //  up to any other instances of this method down the call stack
         iReqHandleType = EMultimodeENStoreReqHandleUnknown;
-        }
-
-    return KErrNone;
+        return KErrNone;
     }
 
 // ---------------------------------------------------------------------------