--- a/stif/TestEngine/src/TestModuleController.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestEngine/src/TestModuleController.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -250,6 +250,11 @@
 
     if ( r != KErrNone )
         {
+        if ( r == KErrBadName )
+            {
+            __TRACE( KError, ( CStifLogger::ERed, _L( "Test Module name or Configuration File name is too long: [%S]" ), &name) );
+            LeaveWithNotifyL( r,  _L( "Test Module name or Configuration File name is too long." ) );
+            }
         __TRACE( KError, ( CStifLogger::ERed, _L( "Can't connect to test module [%S], IniFile [%S]" ), &name, &aIniFile ) );
         LeaveWithNotifyL( r,  _L( "Can't connect to test module" ) );
         }
@@ -393,10 +398,11 @@
     iTestCaseArray.Close();
 
     // Release the config file array
+    iConfigFiles.ResetAndDestroy();
     iConfigFiles.Close();
 
     // Release the config file array
-    iFailedEnumerateConfig.Reset();
+    iFailedEnumerateConfig.ResetAndDestroy();
     iFailedEnumerateConfig.Close();
     
     // Release the children array