diff --git a/commands b/commands
index 5e45e54..600e89b 100755
--- a/commands
+++ b/commands
@@ -79,7 +79,7 @@ case "$1" in
     fi
 
     dokku_log_info1 "Deleting $SERVICE"
-    if [[ -f "$SERVICE_ROOT/ID" ]]; then
+    if [[ -f "$SERVICE_ROOT/ID" ]] && docker ps -aq --no-trunc | grep $(cat "$SERVICE_ROOT/ID"); then
       ID=$(cat "$SERVICE_ROOT/ID")
 
       dokku_log_verbose_quiet "Stopping container"
@@ -90,6 +90,8 @@ case "$1" in
       dokku_log_verbose_quiet "Removing container"
       docker rm -v "$ID" > /dev/null
       sleep 1
+    else
+      dokku_log_verbose_quiet "No container exists for $SERVICE"
     fi
 
     dokku_log_verbose_quiet "Removing data"