diff --git a/plugins/builder-dockerfile/core-post-extract b/plugins/builder-dockerfile/core-post-extract
index c121c86bb..5334e8d3a 100755
--- a/plugins/builder-dockerfile/core-post-extract
+++ b/plugins/builder-dockerfile/core-post-extract
@@ -22,7 +22,7 @@ trigger-builder-dockerfile-core-post-extract() {
 
   if [[ ! -f "$NEW_DOCKERFILE" ]]; then
     dokku_log_fail "Invalid dockerfile-path specified: $NEW_DOCKERFILE"
-    return
+    return 1
   fi
 
   mv "$NEW_DOCKERFILE" Dockerfile
diff --git a/plugins/git/functions b/plugins/git/functions
index 35181407e..c10bc72d0 100755
--- a/plugins/git/functions
+++ b/plugins/git/functions
@@ -44,6 +44,7 @@ git_build_app_repo() {
   else
     git_trigger_build "$APP" "$GIT_BUILD_APP_REPO_TMP_WORK_DIR" "$REV" | sed -u "s/^/"$'\e[1G'"/"
   fi
+  return $?
 }
 
 git_trigger_build() {
@@ -51,7 +52,9 @@ git_trigger_build() {
   declare APP="$1" TMP_WORK_DIR="$2" REV="$3"
   local BUILDER
 
-  plugn trigger core-post-extract "$APP" "$TMP_WORK_DIR" "$REV"
+  if ! plugn trigger core-post-extract "$APP" "$TMP_WORK_DIR" "$REV"; then
+    return 1
+  fi
   plugn trigger post-extract "$APP" "$TMP_WORK_DIR" "$REV"
 
   BUILDER="$(plugn trigger builder-detect "$APP" "$TMP_WORK_DIR" | head -n1 || true)"
@@ -139,6 +142,7 @@ git_build() {
   fi
 
   git_build_app_repo "$APP" "$REF"
+  return $?
 }
 
 git_receive_app() {