diff --git a/dokku b/dokku
index c2848dc1f..28464551d 100755
--- a/dokku
+++ b/dokku
@@ -59,7 +59,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
+      docker kill $oldid > /dev/null 2>&1 || true
     fi
 
     # start the app
diff --git a/plugins/00_dokku-standard/commands b/plugins/00_dokku-standard/commands
index c87ba11ed..b013acbde 100755
--- a/plugins/00_dokku-standard/commands
+++ b/plugins/00_dokku-standard/commands
@@ -16,8 +16,8 @@ case "$1" in
     if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then
       ID=$(< "$DOKKU_ROOT/$APP/CONTAINER")
 
-      docker stop $ID > /dev/null
-      docker rm $ID  > /dev/null
+      docker stop $ID > /dev/null || true
+      docker rm $ID  > /dev/null || true
     fi
 
     docker images | grep $IMAGE | awk '{print $3}' | xargs docker rmi &> /dev/null &