diff --git a/README.md b/README.md
index 2fea0e4..890d322 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ you are troubleshooting.
 
 ### Option: `port`
 
-The `port` setting allows you to change the port the web interface 
+The `port` setting allows you to change the port the web interface
 Traccar is running on.
 
 ### Option: `ssl`
diff --git a/traccar/rootfs/etc/services.d/traccar/run b/traccar/rootfs/etc/services.d/traccar/run
index 6dce408..9f97b1c 100644
--- a/traccar/rootfs/etc/services.d/traccar/run
+++ b/traccar/rootfs/etc/services.d/traccar/run
@@ -22,5 +22,6 @@ options+=(-jar tracker-server.jar)
 options+=(/config/traccar.xml)
 
 # Run the Traccar daemon
-cd /opt/traccar
+cd /opt/traccar || hass.die "Failed to switch to Traccar directory"
+
 exec java "${options[@]}"