Index: shared/scripts/configuration/utility.py
===================================================================
diff -u -r36113b694009f6d153d227dc68cb87d7be28e046 -r4800083679383c87221a7e55ad35f84b40ffb386
--- shared/scripts/configuration/utility.py	(.../utility.py)	(revision 36113b694009f6d153d227dc68cb87d7be28e046)
+++ shared/scripts/configuration/utility.py	(.../utility.py)	(revision 4800083679383c87221a7e55ad35f84b40ffb386)
@@ -866,7 +866,7 @@
     newFileName = filename
     oldFileName = filename + "_1"
     if os.path.exists(path+newFileName):
-        # During running of AUT, the application re-creates the folder (eg: application/resources/settings)
+        # During running of AUT, the application re-creates the folder (eg: unittests/resources/settings)
         # need to delete before renaming
         shutil.rmtree(path+newFileName)
     if os.path.exists(path+oldFileName):
@@ -876,6 +876,9 @@
         test.log(str(oldFileName+" failed to rename to "+newFileName))
 
 def remove_files_in_folder(folder_path):
+    if not os.path.exists(folder_path): 
+        return
+    
     for filename in os.listdir(folder_path):
         file_path = os.path.join(folder_path, filename)
         os.remove(file_path)