diff --git a/swing/src/net/sf/openrocket/gui/main/ExampleDesignFile.java b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFile.java
index d697f042b..e7fa03d33 100644
--- a/swing/src/net/sf/openrocket/gui/main/ExampleDesignFile.java
+++ b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFile.java
@@ -50,11 +50,14 @@ public class ExampleDesignFile implements Comparable<ExampleDesignFile> {
 			logger.debug("Cannot find jar file, trying to load from directory");
 			designs = getDirFileNames();
 		}
-		if (designs == null || designs.length == 0) {
-			return null;
+
+		if (designs == null ){
+			return new ExampleDesignFile[0];
+		}
+
+		if( 0 < designs.length ) {
+			Arrays.sort(designs);
 		}
-		
-		Arrays.sort(designs);
 		
 		return designs;
 	}