diff --git a/pom.xml b/pom.xml
index 480c672..22e0087 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.srsoftware</groupId>
 	<artifactId>web4rail</artifactId>
-	<version>0.9.19</version>
+	<version>0.9.20</version>
 	<name>Web4Rail</name>
 	<packaging>jar</packaging>
 	<description>Java Model Railway Control</description>
diff --git a/src/main/java/de/srsoftware/web4rail/Route.java b/src/main/java/de/srsoftware/web4rail/Route.java
index 4097933..b919533 100644
--- a/src/main/java/de/srsoftware/web4rail/Route.java
+++ b/src/main/java/de/srsoftware/web4rail/Route.java
@@ -540,9 +540,11 @@ public class Route implements Constants{
 		}
 		if (endBlock.route() == this) endBlock.lock(null);
 		if (startBlock.route() == this) startBlock.lock(null);
-		train.heading(startDirection);
-		train.block(startBlock, false);
-		if (train.route == this) train.route = null;
+		if (train != null) {
+			train.heading(startDirection);
+			train.block(startBlock, false);
+			if (train.route == this) train.route = null;
+		}
 	}
 
 	public static void saveAll(Collection<Route> routes, String filename) throws IOException {