1 files changed, 3 insertions, 3 deletions
diff --git a/server/src/com/vaadin/navigator/Navigator.java b/server/src/com/vaadin/navigator/Navigator.java
index df9e5059fa..e4704bce6a 100644
--- a/server/src/com/vaadin/navigator/Navigator.java
+++ b/server/src/com/vaadin/navigator/Navigator.java
@@ -109,10 +109,10 @@ public class Navigator implements Serializable {
         @Override
         public String getState() {
             String fragment = getFragment();
-            if (fragment.startsWith("!")) {
-                return fragment.substring(1);
-            } else {
+            if (fragment == null || !fragment.startsWith("!")) {
                 return "";
+            } else {
+                return fragment.substring(1);
             }
         }