Merged: Added null check and un-ignored exception

svn changeset:9580/svn branch:6.2

1 files changed, 14 insertions, 10 deletions

diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
index 8ffd7b3f16..896d4e651c 100644
--- a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
@@ -157,18 +157,22 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet {
             return appClass;
         } catch (Exception e) {
             //
-            for (int i = 0; i < defaultPackages.length; i++) {
-                try {
-                    appClass = (Class<? extends Application>) getClass()
-                            .getClassLoader().loadClass(
-                                    defaultPackages[i] + "." + baseName);
-                } catch (Exception e2) {
-                    // TODO: handle exception
-                }
-                if (appClass != null) {
-                    return appClass;
+            if (defaultPackages != null) {
+                for (int i = 0; i < defaultPackages.length; i++) {
+                    try {
+                        appClass = (Class<? extends Application>) getClass()
+                                .getClassLoader().loadClass(
+                                        defaultPackages[i] + "." + baseName);
+                    } catch (Exception e2) {
+                        // TODO: handle exception
+                        e2.printStackTrace();
+                    }
+                    if (appClass != null) {
+                        return appClass;
+                    }
                 }
             }
+
         }
 
         throw new ClassNotFoundException();