diff --git a/plugins/git/receive-app b/plugins/git/receive-app
index 328fbeb1d..3a95f6169 100755
--- a/plugins/git/receive-app
+++ b/plugins/git/receive-app
@@ -6,7 +6,7 @@ APP="$1"; REV="$2"
 
 # Don't trigger git build if there is no git repository.
 if [ ! -d "$DOKKU_ROOT/$APP/refs" ]; then
-  cat
+  cat || true
 else
   dokku git-build $APP $REV
 fi
diff --git a/plugins/tar/commands b/plugins/tar/commands
index d84d693da..cdf13b516 100755
--- a/plugins/tar/commands
+++ b/plugins/tar/commands
@@ -8,7 +8,7 @@ case "$1" in
     APP=$2
     URL=$3
     shift 3
-    curl -# --insecure -L "$URL" | dokku tar-in $APP $@
+    curl -# --insecure -L "$URL" | dokku tar-in $APP "$@"
     ;;
 
   tar-in|tar:in)
diff --git a/plugins/tar/receive-app b/plugins/tar/receive-app
index ca2418290..1c9428ccb 100755
--- a/plugins/tar/receive-app
+++ b/plugins/tar/receive-app
@@ -6,7 +6,7 @@ APP="$1"; REV="$2"
 
 # Don't trigger tar build if there is no tarball.
 if [ ! -f "$DOKKU_ROOT/$APP/src.tar" ]; then
-  cat
+  cat || true
 else
   dokku tar-build $APP
 fi