KrailOrg
diff --git a/‎src/main/java/uk/q3c/krail/core/navigate/DefaultNavigator.java‎
Lines changed: 4 additions & 1 deletion b/‎src/main/java/uk/q3c/krail/core/navigate/DefaultNavigator.java‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎src/main/kotlin/uk/q3c/krail/core/form/Form.kt‎
Lines changed: 2 additions & 2 deletions b/‎src/main/kotlin/uk/q3c/krail/core/form/Form.kt‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/main/kotlin/uk/q3c/krail/core/view/NavigationStateExt.kt‎
Lines changed: 1 addition & 1 deletion b/‎src/main/kotlin/uk/q3c/krail/core/view/NavigationStateExt.kt‎
Lines changed: 1 addition & 1 deletion
@@ -394,7 +394,10 @@ public void error(Throwable error) {
         ErrorView view = viewFactory.get(ErrorView.class);
         view.setError(error);
         UserSitemapNode node = userSitemap.nodeFor(navigationState);
-        changeView(view, new NavigationStateExt(previousNavigationState, navigationState, null));
+        if (node == null) {
+            node = userSitemap.standardPageNode(StandardPageKey.Log_Out); // TODO there should be a node for error https://github.com/KrailOrg/krail/issues/711
+        }
+        changeView(view, new NavigationStateExt(previousNavigationState, navigationState, node));
     }
 
     /**
 
@@ -83,11 +83,11 @@ class DefaultForm @Inject constructor(
     }
 
     override fun doBuild() {
-        val viewConfigurationClass = navigationStateExt.node?.masterNode?.viewConfiguration
+        val viewConfigurationClass = navigationStateExt.node.masterNode.viewConfiguration
         val formConfiguration =
                 if (FormConfiguration::class.java.isAssignableFrom(viewConfigurationClass)) {
                     try {
-                        viewConfigurationClass?.newInstance() as FormConfiguration
+                        viewConfigurationClass.newInstance() as FormConfiguration
                     } catch (e: Exception) {
                         log.error("Failed to set form configuration", e)
                         EmptyFormConfiguration()
 
@@ -7,4 +7,4 @@ import java.io.Serializable
 /**
  * Created by David Sowerby on 12 Jun 2018
  */
-data class NavigationStateExt(val from: NavigationState?, val to: NavigationState, val node: UserSitemapNode?) : Serializable
+data class NavigationStateExt(val from: NavigationState?, val to: NavigationState, val node: UserSitemapNode) : Serializable