diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh
index d1d0440da..8c97a3ec2 100755
--- a/iso/bootstrap_admin_node.sh
+++ b/iso/bootstrap_admin_node.sh
@@ -111,7 +111,10 @@ function countdown() {
 }
 
 function fail() {
-  echo "ERROR: Fuel node deployment FAILED! Check "${LOGFILE}" for details" 1>&2
+  MSG="ERROR: Fuel node deployment FAILED! Check ${LOGFILE} for details"
+  # LP: #1551658 - Ensure data will be flushed on disk
+  sed -i -u "\$a${MSG}" "${LOGFILE}"
+
   exit 1
 }
 
@@ -501,10 +504,7 @@ if [ ${old_sysctl_vm_value} -lt 65535 ]; then
 fi
 
 # apply puppet
-/etc/puppet/modules/fuel/examples/deploy.sh
-if [[ $? -ne 0 ]]; then
-    fail
-fi
+/etc/puppet/modules/fuel/examples/deploy.sh || fail
 
 # Sync time
 systemctl stop ntpd