diff --git a/home.admin/00raspiblitz.sh b/home.admin/00raspiblitz.sh
index dddf97e07..074d07c21 100755
--- a/home.admin/00raspiblitz.sh
+++ b/home.admin/00raspiblitz.sh
@@ -242,18 +242,29 @@ do
       echo "***********************************************************"
       exit 1
     fi
-
+error
     # 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}" == "error" ] || [ "${state}" == "errorHDD" ]; then
+      clear
+      echo "###########################################################"
+      echo "# /home/admin/raspiblitz.log"
+      cat /home/admin/raspiblitz.log
       if [ "${state}" == "errorHDD" ]; then
+        # print some debug detail info on HDD/SSD error
+        echo "###########################################################"
+        echo "# blitz.datadrive.sh status"
+        sudo /home/admin/config.scripts/blitz.datadrive.sh status
+      fi
+      if [ "${message}" == "_provision.setup.sh fail" ]; then
         # print some debug detail info on HDD/SSD error
         echo "# blitz.datadrive.sh status"
         sudo /home/admin/config.scripts/blitz.datadrive.sh status
       fi
+      echo "***********************************************************"
+      echo "ERROR - please report to development team"
+      echo "***********************************************************"
+      echo "state(${state}) message(${message})"
+      echo "https://github.com/rootzoll/raspiblitz#support"
       echo "command to shutdown --> off"
       exit 1
     else
diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index 9b594355c..5682e1a98 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -543,8 +543,8 @@ if [ ${isMounted} -eq 0 ]; then
   echo "the provision process was started but did not finish yet" > /home/admin/provision.flag
 
   # make HDD is still temp mounted
+  source <(/home/admin/config.scripts/blitz.datadrive.sh status)
   echo "Temp mounting (2) data drive ($hddCandidate)" >> $logFile
-  source <(/home/admin/config.scripts/internet.sh status)
   if [ "${hddFormat}" != "btrfs" ]; then
     source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddPartitionCandidate})
   else
@@ -552,6 +552,13 @@ if [ ${isMounted} -eq 0 ]; then
   fi
   echo "Temp mounting (2) result: ${isMounted}" >> $logFile
 
+  # check that HDD was temp mounted
+  if [ "${isMounted}" != "1"]; then
+    sed -i "s/^state=.*/state=errorHDD/g" ${infoFile}
+    sed -i "s/^message=.*/message='Was not able to mount HDD (2)'/g" ${infoFile}
+    exit 1
+  fi
+
   # make sure all links between directories/drives are correct
   echo "Refreshing links between directories/drives .." >> $logFile
   sudo /home/admin/config.scripts/blitz.datadrive.sh link
@@ -572,7 +579,7 @@ if [ ${isMounted} -eq 0 ]; then
   cat ${configFile} >> ${logFile}
   echo "# Sourcing ${setupFile} " >> ${logFile}
   source ${setupFile}
-  cat ${setupFile} >> ${logFile}
+  sed -e '/^password/d' ${setupFile} >> ${logFile}
   
   # make sure basic info is in raspiblitz.info
   echo "# Update ${infoFile} " >> ${logFile}