From cbca0c42c4d2e954c855090ca315ac80917a0981 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Sat, 23 Jul 2016 01:00:53 +0200
Subject: [PATCH] Some robustness changes

---
 src/zutil/ui/Navigation.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/zutil/ui/Navigation.java b/src/zutil/ui/Navigation.java
index 8703221..3271dbb 100755
--- a/src/zutil/ui/Navigation.java
+++ b/src/zutil/ui/Navigation.java
@@ -172,7 +172,10 @@ public class Navigation implements Iterable{
      * Will create a clone of the navigation tree with some request instance specific information
      */
     public NavInstance createParameterizedNavInstance(Map<String, String> request){
-        return createParameterizedNavInstance(getBreadcrumb(getParameterizedNavigation(request)));
+        Navigation nav = getParameterizedNavigation(request);
+        if (nav != null)
+            return createParameterizedNavInstance(getBreadcrumb(nav));
+        return createParameterizedNavInstance(Collections.EMPTY_LIST);
     }
     private NavInstance createParameterizedNavInstance(List<Navigation> activeList){
         NavInstance instance = new ParameterizedNavInstance(this);
@@ -196,7 +199,7 @@ public class Navigation implements Iterable{
         Navigation nav = getPagedNavigation(header);
         if (nav != null)
             return createPagedNavInstance(getBreadcrumb(nav));
-        return null;
+        return createPagedNavInstance(Collections.EMPTY_LIST);
     }
     private NavInstance createPagedNavInstance(List<Navigation> activeList){
         NavInstance instance = new PagedNavInstance(this);