Index: /trunk/autoquest-generic-event-monitor-test/src/test/java/de/ugoe/cs/autoquest/genericeventmonitor/GenericEventMonitorTest.java
===================================================================
--- /trunk/autoquest-generic-event-monitor-test/src/test/java/de/ugoe/cs/autoquest/genericeventmonitor/GenericEventMonitorTest.java	(revision 2231)
+++ /trunk/autoquest-generic-event-monitor-test/src/test/java/de/ugoe/cs/autoquest/genericeventmonitor/GenericEventMonitorTest.java	(revision 2232)
@@ -652,6 +652,9 @@
         if (file.exists()) {
             if (file.isDirectory()) {
-                for (File child : file.listFiles()) {
-                    deleteFiles(child);
+            	File[] files = file.listFiles();
+            	if (files != null) {
+                    for (File child : files) {
+                       deleteFiles(child);
+                    }
                 }
             }
Index: /trunk/autoquest-htmlmonitor-test/src/test/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorTest.java
===================================================================
--- /trunk/autoquest-htmlmonitor-test/src/test/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorTest.java	(revision 2231)
+++ /trunk/autoquest-htmlmonitor-test/src/test/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorTest.java	(revision 2232)
@@ -825,6 +825,9 @@
         if (file.exists()) {
             if (file.isDirectory()) {
-                for (File child : file.listFiles()) {
-                    deleteFiles(child);
+            	File[] files = file.listFiles();
+            	if (files != null) {
+                    for (File child : files) {
+                       deleteFiles(child);
+                    }
                 }
             }
Index: /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorOutputWriter.java
===================================================================
--- /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorOutputWriter.java	(revision 2231)
+++ /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorOutputWriter.java	(revision 2232)
@@ -535,5 +535,5 @@
      */
     private void handleOldLogFiles(File oldLogDir, File newLogDir) {
-        if (oldLogDir.exists() && oldLogDir.isDirectory()) {
+        if (oldLogDir.exists() && oldLogDir.isDirectory() && (oldLogDir.listFiles() != null)) {
             boolean allFilesRenamed = true;
             for (File oldLogFile : oldLogDir.listFiles()) {
Index: /trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/AbstractTC.java
===================================================================
--- /trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/AbstractTC.java	(revision 2231)
+++ /trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/AbstractTC.java	(revision 2232)
@@ -83,5 +83,5 @@
     
     /** */
-    private static Tomcat tomcat = new Tomcat();
+    private Tomcat tomcat = new Tomcat();
     
     /**
@@ -295,6 +295,9 @@
         if (file.exists()) {
             if (file.isDirectory()) {
-                for (File child : file.listFiles()) {
-                    deleteFiles(child);
+            	File[] files = file.listFiles();
+            	if (files != null) {
+                    for (File child : files) {
+                       deleteFiles(child);
+                    }
                 }
             }
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/commands/CMDparseDirAndroid.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/commands/CMDparseDirAndroid.java	(revision 2231)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/commands/CMDparseDirAndroid.java	(revision 2232)
@@ -69,14 +69,18 @@
 
         String absolutPath = folder.getAbsolutePath();
-        for (String filename : folder.list()) {
-            String source = absolutPath + File.separator + filename;
-            Console.traceln(Level.INFO, "Processing file: " + source);
+        String[] filenames = folder.list();
+        
+        if (filenames != null) {
+        	for (String filename : filenames) {
+        		String source = absolutPath + File.separator + filename;
+        		Console.traceln(Level.INFO, "Processing file: " + source);
 
-            try {
-                parser.parseFile(source);
-            }
-            catch (Exception e) {
-                Console.printerrln("Could not parse " + source + ": " + e.getMessage());
-            }
+        		try {
+        			parser.parseFile(source);
+        		}
+        		catch (Exception e) {
+        			Console.printerrln("Could not parse " + source + ": " + e.getMessage());
+        		}
+        	}
         }
 
Index: /trunk/autoquest-plugin-core-test/src/test/java/de/ugoe/cs/autoquest/plugin/PluginLoaderTest.java
===================================================================
--- /trunk/autoquest-plugin-core-test/src/test/java/de/ugoe/cs/autoquest/plugin/PluginLoaderTest.java	(revision 2231)
+++ /trunk/autoquest-plugin-core-test/src/test/java/de/ugoe/cs/autoquest/plugin/PluginLoaderTest.java	(revision 2232)
@@ -198,5 +198,5 @@
 			loader.load();
 		} catch(PluginLoaderException e) {
-			e.getMessage().endsWith("not instance of AutoQUESTPlugin");
+			assertTrue(e.getMessage().endsWith("not instance of AutoQUESTPlugin"));
 		}
 	}
@@ -209,5 +209,5 @@
 			loader.load();
 		} catch(PluginLoaderException e) {
-			e.getMessage().startsWith("No class");
+			assertTrue(e.getMessage().startsWith("No class"));
 		}
 	}
@@ -220,5 +220,5 @@
 			loader.load();
 		} catch(PluginLoaderException e) {
-			e.getMessage().endsWith("Could not access");
+			assertTrue(e.getMessage().endsWith("Could not access"));
 		}
 	}
Index: /trunk/autoquest-plugin-core/src/main/java/de/ugoe/cs/autoquest/plugin/PluginLoader.java
===================================================================
--- /trunk/autoquest-plugin-core/src/main/java/de/ugoe/cs/autoquest/plugin/PluginLoader.java	(revision 2231)
+++ /trunk/autoquest-plugin-core/src/main/java/de/ugoe/cs/autoquest/plugin/PluginLoader.java	(revision 2232)
@@ -97,31 +97,33 @@
 		});
 
-		for (File jarFile : jarFiles) {
-			updateClassLoader(jarFile);
-
-			String pluginName = jarFile.getName().split("-")[2];
-			String pluginClassName = "de.ugoe.cs.autoquest.plugin." + pluginName
-					+ "." + pluginName.toUpperCase() + "Plugin";
-
-			Class<?> pluginClass = null;
-			try {
-				pluginClass = Class.forName(pluginClassName);
-			} catch (ClassNotFoundException e) {
-				throw new PluginLoaderException("No class '" + pluginClassName
-						+ "' found in " + pluginDir + "/" + jarFile.getName());
-			}
-			try {
-				AutoQUESTPlugin pluginObject = (AutoQUESTPlugin) pluginClass
-						.newInstance();
-				plugins.add(pluginObject);
-			} catch (InstantiationException e) {
-				throw new PluginLoaderException("Could not instantiate "
-						+ pluginClassName);
-			} catch (IllegalAccessException e) {
-				throw new PluginLoaderException("Could not access "
-						+ pluginClassName);
-			} catch (ClassCastException e) {
-				throw new PluginLoaderException("Class " + pluginClassName
-						+ " not instance of AutoQUESTPlugin");
+		if (jarFiles != null) {
+			for (File jarFile : jarFiles) {
+				updateClassLoader(jarFile);
+
+				String pluginName = jarFile.getName().split("-")[2];
+				String pluginClassName = "de.ugoe.cs.autoquest.plugin." + pluginName
+						+ "." + pluginName.toUpperCase() + "Plugin";
+
+				Class<?> pluginClass = null;
+				try {
+					pluginClass = Class.forName(pluginClassName);
+				} catch (ClassNotFoundException e) {
+					throw new PluginLoaderException("No class '" + pluginClassName
+							+ "' found in " + pluginDir + "/" + jarFile.getName());
+				}
+				try {
+					AutoQUESTPlugin pluginObject = (AutoQUESTPlugin) pluginClass
+							.newInstance();
+					plugins.add(pluginObject);
+				} catch (InstantiationException e) {
+					throw new PluginLoaderException("Could not instantiate "
+							+ pluginClassName);
+				} catch (IllegalAccessException e) {
+					throw new PluginLoaderException("Could not access "
+							+ pluginClassName);
+				} catch (ClassCastException e) {
+					throw new PluginLoaderException("Class " + pluginClassName
+							+ " not instance of AutoQUESTPlugin");
+				}
 			}
 		}
Index: /trunk/autoquest-plugin-genericevents/src/main/java/de/ugoe/cs/autoquest/plugin/genericevents/commands/CMDparseDirGenericEvents.java
===================================================================
--- /trunk/autoquest-plugin-genericevents/src/main/java/de/ugoe/cs/autoquest/plugin/genericevents/commands/CMDparseDirGenericEvents.java	(revision 2231)
+++ /trunk/autoquest-plugin-genericevents/src/main/java/de/ugoe/cs/autoquest/plugin/genericevents/commands/CMDparseDirGenericEvents.java	(revision 2232)
@@ -112,9 +112,12 @@
         if (file.isDirectory()) {
             String[] children = file.list();
-            Arrays.sort(children);
             
-            for (String child : children) {
-                File childFile = new File(file, child);
-                parseFile(childFile, parser);
+            if (children != null) {
+            	Arrays.sort(children);
+
+            	for (String child : children) {
+            		File childFile = new File(file, child);
+            		parseFile(childFile, parser);
+            	}
             }
         }
Index: /trunk/autoquest-plugin-genericevents/src/main/java/de/ugoe/cs/autoquest/plugin/genericevents/commands/CMDsplitDirGenericEvents.java
===================================================================
--- /trunk/autoquest-plugin-genericevents/src/main/java/de/ugoe/cs/autoquest/plugin/genericevents/commands/CMDsplitDirGenericEvents.java	(revision 2231)
+++ /trunk/autoquest-plugin-genericevents/src/main/java/de/ugoe/cs/autoquest/plugin/genericevents/commands/CMDsplitDirGenericEvents.java	(revision 2232)
@@ -95,10 +95,13 @@
         if (source.isDirectory()) {
             String[] children = source.list();
-            Arrays.sort(children);
             
-            for (String child : children) {
-                File childFile = new File(source, child);
-                File childDestination = new File(dest, child);
-                splitFile(childFile, childDestination, timediff);
+            if (children != null) {
+            	Arrays.sort(children);
+
+            	for (String child : children) {
+            		File childFile = new File(source, child);
+            		File childDestination = new File(dest, child);
+            		splitFile(childFile, childDestination, timediff);
+            	}
             }
         }
Index: /trunk/autoquest-plugin-guitar/src/main/java/de/ugoe/cs/autoquest/plugin/guitar/commands/CMDefgTestCasesToSequences.java
===================================================================
--- /trunk/autoquest-plugin-guitar/src/main/java/de/ugoe/cs/autoquest/plugin/guitar/commands/CMDefgTestCasesToSequences.java	(revision 2231)
+++ /trunk/autoquest-plugin-guitar/src/main/java/de/ugoe/cs/autoquest/plugin/guitar/commands/CMDefgTestCasesToSequences.java	(revision 2232)
@@ -74,9 +74,13 @@
 			parser = new GUITARTestCaseParser(efgFileName);
 		}
-		for (File testcaseFile : testcaseFiles) {
-			Console.traceln(Level.INFO, "Loading from file "
-					+ testcaseFile.getAbsolutePath());
-			sequences.add(parser.parseTestCaseFile(testcaseFile));
+		
+		if (testcaseFiles != null) {
+			for (File testcaseFile : testcaseFiles) {
+				Console.traceln(Level.INFO, "Loading from file "
+						+ testcaseFile.getAbsolutePath());
+				sequences.add(parser.parseTestCaseFile(testcaseFile));
+			}
 		}
+		
 		if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) {
 			CommandHelpers.dataOverwritten(sequencesName);
Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDcompressHTMLLogFiles.java
===================================================================
--- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDcompressHTMLLogFiles.java	(revision 2231)
+++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDcompressHTMLLogFiles.java	(revision 2232)
@@ -72,11 +72,14 @@
         if (directory.isDirectory()) {
             File[] children = directory.listFiles();
-            Arrays.sort(children);
             
-            boolean containsAtLeastOneFile = false;
-            for (File child : children) {
-                compressDirectory(child);
-                
-                containsAtLeastOneFile |= child.isFile();
+        	boolean containsAtLeastOneFile = false;
+            if (children != null) {
+            	Arrays.sort(children);
+
+            	for (File child : children) {
+            		compressDirectory(child);
+
+            		containsAtLeastOneFile |= child.isFile();
+            	}
             }
             
Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDcorrectHTMLLogDirs.java
===================================================================
--- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDcorrectHTMLLogDirs.java	(revision 2231)
+++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDcorrectHTMLLogDirs.java	(revision 2232)
@@ -78,9 +78,12 @@
         if (file.isDirectory()) {
             String[] children = file.list();
-            Arrays.sort(children);
             
-            for (String child : children) {
-                File childFile = new File(file, child);
-                correctDirectory(childFile, mainFolder);
+            if (children != null) {
+            	Arrays.sort(children);
+
+            	for (String child : children) {
+            		File childFile = new File(file, child);
+            		correctDirectory(childFile, mainFolder);
+            	}
             }
         }
Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDdeleteHTMLQueries.java
===================================================================
--- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDdeleteHTMLQueries.java	(revision 2231)
+++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDdeleteHTMLQueries.java	(revision 2232)
@@ -71,6 +71,8 @@
             File[] children = directory.listFiles();
             
-            for (File child : children) {
-                deleteHTMLQueriesInDirectory(child);
+            if (children != null) {
+                for (File child : children) {
+                    deleteHTMLQueriesInDirectory(child);
+                }
             }
         }
Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseDirHTML.java
===================================================================
--- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseDirHTML.java	(revision 2231)
+++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseDirHTML.java	(revision 2232)
@@ -130,9 +130,12 @@
         if (file.isDirectory()) {
             String[] children = file.list();
-            Arrays.sort(children);
             
-            for (String child : children) {
-                File childFile = new File(file, child);
-                parseFile(childFile, parser);
+            if (children != null) {
+            	Arrays.sort(children);
+
+            	for (String child : children) {
+            		File childFile = new File(file, child);
+            		parseFile(childFile, parser);
+            	}
             }
         }
Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDpseudomizeHTMLTextInputs.java
===================================================================
--- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDpseudomizeHTMLTextInputs.java	(revision 2231)
+++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDpseudomizeHTMLTextInputs.java	(revision 2232)
@@ -88,7 +88,9 @@
             File[] children = directory.listFiles();
             
-            for (File child : children) {
-                pseudomizeTextInputsInDirectory
-                    (child, pseudomizeSearchInputs, pseudomizeFileInputs);
+            if (children != null) {
+            	for (File child : children) {
+            		pseudomizeTextInputsInDirectory
+            		(child, pseudomizeSearchInputs, pseudomizeFileInputs);
+            	}
             }
         }