diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
index a14dfcf..674eaf9 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
@@ -224,7 +224,9 @@ public class BRouterView extends View {
       // add a "last timeout" dummy profile
       File lastTimeoutFile = new File(modesDir + "/timeoutdata.txt");
       long lastTimeoutTime = lastTimeoutFile.lastModified();
-      if (lastTimeoutTime > 0 && System.currentTimeMillis() - lastTimeoutTime < 1800000) {
+      if (lastTimeoutTime > 0 &&
+        lastTimeoutFile.length() > 0 &&
+        System.currentTimeMillis() - lastTimeoutTime < 1800000) {
         BufferedReader br = new BufferedReader(new FileReader(lastTimeoutFile));
         String repeatProfile = br.readLine();
         br.close();
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java
index f7a74ff..1c733ba 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java
@@ -214,10 +214,14 @@ public class BRouterWorker {
   }
 
   private void writeWPList(BufferedWriter bw, List<OsmNodeNamed> wps) throws Exception {
-    bw.write(wps.size() + "\n");
-    for (OsmNodeNamed wp : wps) {
-      bw.write(wp.toString());
-      bw.write("\n");
+    if (wps == null) {
+      bw.write("0\n");
+    } else {
+      bw.write(wps.size() + "\n");
+      for (OsmNodeNamed wp : wps) {
+        bw.write(wp.toString());
+        bw.write("\n");
+      }
     }
   }
 }