diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java
index 83b6df6db..b5a3e9fb2 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java
@@ -92,9 +92,10 @@ public class CompanyPlanningController implements Composer{
                 && !(parameters.isEmpty())) {
             zoomLevelParameter = parameters.get("zoom")[0];
         }
-        planner
-                .setInitialZoomLevel(ZoomLevel
-                        .getFromString(zoomLevelParameter));
+        if (zoomLevelParameter != null) {
+            planner.setInitialZoomLevel(ZoomLevel
+                    .getFromString(zoomLevelParameter));
+        }
         planner.setAreContainersExpandedByDefault(Planner
                 .guessContainersExpandedByDefault(parameters));
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java
index d02c2558d..5f631054a 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java
@@ -111,9 +111,10 @@ public class OrderPlanningController implements Composer {
                 && !(parameters.isEmpty())) {
             zoomLevelParameter = parameters.get("zoom")[0];
         }
-        planner
-                .setInitialZoomLevel(ZoomLevel
-                        .getFromString(zoomLevelParameter));
+        if (zoomLevelParameter != null) {
+            planner.setInitialZoomLevel(ZoomLevel
+                    .getFromString(zoomLevelParameter));
+        }
         planner.setAreContainersExpandedByDefault(Planner
                 .guessContainersExpandedByDefault(parameters));
         updateConfiguration();