diff --git a/home.admin/00raspiblitz.sh b/home.admin/00raspiblitz.sh
index 46b692ce6..c5f8f1b43 100755
--- a/home.admin/00raspiblitz.sh
+++ b/home.admin/00raspiblitz.sh
@@ -89,7 +89,7 @@ do
 
     echo "# DURING SETUP: Handle System State (${state})"
 
-    # when no HDD on Vagrant - just print info & exit (admin info)
+    # when no HDD on Vagrant - just print info & exit (admin info & exit)
     if [ "${state}" == "noHDD" ] && [ ${vagrant} -gt 0 ]; then
       echo "***********************************************************"
       echo "VAGRANT INFO"
@@ -106,6 +106,19 @@ do
       echo "space on your laptop you can store the VDI file on an external drive."
       echo "***********************************************************"
       exit 1
+
+    # for all critical errors (admin info & exit)
+    if [ "${state}" == "errorHDD" ]; then
+      echo "***********************************************************"
+      echo "SETUP ERROR - please report to development team"
+      echo "***********************************************************"
+      echo "state(${state}) message(${message})"
+      if [ "${state}" == "errorHDD" ]; then
+        # print some debug detail info on HDD/SSD error
+        sudo /home/admin/config.scripts/blitz.datadrive.sh status
+      fi
+      echo "command to shutdown --> off"
+      exit 1
     else
 
         # every other state just push as event to SSH frontend
diff --git a/home.admin/setup.scripts/eventInfoWait.sh b/home.admin/setup.scripts/eventInfoWait.sh
index 564e1cb5b..e604e5811 100644
--- a/home.admin/setup.scripts/eventInfoWait.sh
+++ b/home.admin/setup.scripts/eventInfoWait.sh
@@ -35,6 +35,12 @@ Starting RaspiBlitz
 Please wait ...
 " 6 24
 
+elif [ "${eventID}" == "reboot" ]; then
+
+    dialog --backtitle "${backtitle}" --cr-wrap --infobox "
+Shutting down for reboot.
+" 5 30
+
 elif [ "${eventID}" == "noHDD" ]; then
 
     # contentWords[0] --> size string (for example '1TB')