diff --git a/dokku b/dokku
index dc7aa0ef2..30e8582d8 100755
--- a/dokku
+++ b/dokku
@@ -60,7 +60,7 @@ case "$1" in
     # kill the app when running
     if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then
       oldid=$(< "$DOKKU_ROOT/$APP/CONTAINER")
-      docker kill $oldid > /dev/null 2>&1 || true
+      docker inspect $oldid &> /dev/null && docker kill $oldid > /dev/null
     fi
 
     # start the app