diff --git a/docs/roles/sync/database_sync/database_sync-mysql.md b/docs/roles/sync/database_sync/database_sync-mysql.md
index cf7e5311..cbe1a353 100644
--- a/docs/roles/sync/database_sync/database_sync-mysql.md
+++ b/docs/roles/sync/database_sync/database_sync-mysql.md
@@ -6,6 +6,7 @@ Sync MySQL databases between environments.
 ---
 mysql_sync:
   mysqldump_params: "{{ _mysqldump_params }}" # set in _init but you can override here
+  cleanup: true # if false leaves tmp database dump on deploy server for debugging purposes
   databases:
     - source:
         # Name of the database to take a dump from.
diff --git a/roles/config_generate/config_generate-drupal7/tasks/settings.yml b/roles/config_generate/config_generate-drupal7/tasks/settings.yml
index f8e3b55e..55d9dee7 100644
--- a/roles/config_generate/config_generate-drupal7/tasks/settings.yml
+++ b/roles/config_generate/config_generate-drupal7/tasks/settings.yml
@@ -19,6 +19,6 @@
     src: "{{ item }}"
     dest: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}/settings.php"
   with_first_found:
-    - "{{ playbook_dir }}/{{ webroot }}/sites/{{ site.folder }}/{{ build_type }}.settings.php.j2"
+    - "{{ playbook_dir }}/{{ site.folder }}/{{ build_type }}.settings.php.j2"
     - "{{ _ce_deploy_build_dir }}/{{ webroot }}/sites/{{ site.folder }}/{{ build_type }}.settings.php"
     - "settings.php.j2"
diff --git a/roles/deploy_code/deploy_code-custom/tasks/main.yml b/roles/deploy_code/deploy_code-custom/tasks/main.yml
new file mode 100644
index 00000000..6f34c92f
--- /dev/null
+++ b/roles/deploy_code/deploy_code-custom/tasks/main.yml
@@ -0,0 +1,3 @@
+---
+
+# Nothing to do here.
\ No newline at end of file
diff --git a/roles/sync/database_sync/database_sync-mysql/README.md b/roles/sync/database_sync/database_sync-mysql/README.md
index cf7e5311..cbe1a353 100644
--- a/roles/sync/database_sync/database_sync-mysql/README.md
+++ b/roles/sync/database_sync/database_sync-mysql/README.md
@@ -6,6 +6,7 @@ Sync MySQL databases between environments.
 ---
 mysql_sync:
   mysqldump_params: "{{ _mysqldump_params }}" # set in _init but you can override here
+  cleanup: true # if false leaves tmp database dump on deploy server for debugging purposes
   databases:
     - source:
         # Name of the database to take a dump from.
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 63e89bb9..74ba9a60 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -156,9 +156,6 @@ ansible_host_check(){
   if [ -n "$TARGET_DEPLOY_HOST" ]; then
     ANSIBLE_BIN=$(command -v ansible-playbook)
     ANSIBLE_CMD="$ANSIBLE_BIN $OWN_DIR/scripts/host-check.yml"
-    if [ "$DRY_RUN" = "yes" ]; then
-      ANSIBLE_CMD="$ANSIBLE_CMD --check"
-    fi
     if [ "$VERBOSE" = "yes" ]; then
       ANSIBLE_CMD="$ANSIBLE_CMD -vvvv"
     fi
@@ -167,6 +164,9 @@ ansible_host_check(){
     fi
     $ANSIBLE_CMD --extra-vars "{_deploy_host: $TARGET_DEPLOY_HOST}" --extra-vars "$ANSIBLE_DEFAULT_EXTRA_VARS" --extra-vars "$ANSIBLE_EXTRA_VARS"
     return $?
+  # No host to check provided, just return a clean exit code.
+  else
+    return 0
   fi
 }
 
diff --git a/scripts/build.sh b/scripts/build.sh
index 233ca764..93f36887 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -95,8 +95,14 @@ fi
 # Get Ansible defaults.
 get_ansible_defaults_vars
 
-# Optionally carry out a host check.
+# Optionally carry out a host check if --host is provided.
 ansible_host_check
+ANSIBLE_HOST_CHECK_RESULT=$?
+# Exit early if host not found.
+if [ -n "$ANSIBLE_HOST_CHECK_RESULT" ] && [ "$ANSIBLE_HOST_CHECK_RESULT" != 0 ]; then
+  echo "ce-deploy failed to find the host. Aborting."
+  exit 1
+fi
 
 # From this point on, we want to trigger the "revert" if anything fails.
 ANSIBLE_BUILD_RESULT=1
@@ -113,5 +119,5 @@ if [ -n "$ANSIBLE_BUILD_RESULT" ] && [ "$ANSIBLE_BUILD_RESULT" = 0 ]; then
   exit 0
 fi
 # Failed somehow. Normally unreachable in strict mode.
-echo "Something went wrong. Please fill a bug report against ce-deploy."
+echo "Something went unexpectedly wrong with ce-deploy. Please file a bug report - https://github.com/codeenigma/ce-deploy/issues/new"
 exit 1
\ No newline at end of file