--- a/stif/TestServer/src/Testserversession.cpp	Fri Mar 12 15:50:45 2010 +0200
+++ b/stif/TestServer/src/Testserversession.cpp	Mon Mar 15 12:46:13 2010 +0200
@@ -646,8 +646,14 @@
     // Get data from message
     TFileName config;
     TRAPD( res, aMessage.ReadL( 0, config ) );
-    if( res != KErrNone )
+    if(res == KErrDied)
         {
+        RDebug::Print(_L("CTestModule::EnumerateTestCasesL() Reading from RMessage ended with KErrDied. Client is not alive anymore and this request will be ignored"));
+        return res;
+        }
+    else if( res != KErrNone )
+        {
+        RDebug::Print(_L("CTestModule::EnumerateTestCasesL() #1 Panic client with [%d], res=[%d]"), EBadDescriptor, res);
         PanicClient( EBadDescriptor, aMessage );
         return res;
         }
@@ -702,8 +708,14 @@
     
     TPckgBuf<TInt> countPckg( testCases->Count() );
     TRAP( res, aMessage.WriteL( 1, countPckg ) );
-    if( res != KErrNone )
+    if(res == KErrDied)
         {
+        RDebug::Print(_L("CTestModule::EnumerateTestCasesL() Writing to RMessage ended with KErrDied. Client is not alive anymore and this request will be ignored"));
+        return res;
+        }
+    else if( res != KErrNone )
+        {
+        RDebug::Print(_L("CTestModule::EnumerateTestCasesL() #2 Panic client with [%d], res=[%d], config=[%S]"), EBadDescriptor, res, &config);
         PanicClient( EBadDescriptor, aMessage );
         return res;
         }