diff --git a/setup/so-functions b/setup/so-functions
index 70c96f794..3fb98cd23 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1241,8 +1241,9 @@ salt_checkin() {
 				cat /etc/pki/ca.crt
 				echo " Applyng a mine hack";
 				salt '*' mine.send x509.get_pem_entries glob_path=/etc/pki/ca.crt;
-				echo " Confirming salt mine now contain the certificate"
-				salt \* mine.get \* x509.get_pem_entries
+				salt '*' mine.update;
+				echo " Confirming salt mine now contain the certificate";
+				salt '*' mine.get '*' x509.get_pem_entries;
 				echo " Applying SSL state";
 				salt-call state.apply ssl;
 			} >> "$setup_log" 2>&1
diff --git a/setup/so-setup b/setup/so-setup
index 478151def..54b5a03e4 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -52,10 +52,14 @@ echo "---- Starting setup at $(date -u) ----" >> $setup_log 2>&1
 automated=no
 function progress() {
 	if [ $automated == no ]; then
+		if grep -q "ERROR" $setup_log || [[ -s /var/spool/mail/root ]]; then
+			whiptail_setup_failed
+		fi
 		whiptail --title "Security Onion Install" --gauge 'Please wait while installing' 6 60 0
 	else
 		cat >> $setup_log 2>&1
 	fi
+	
 }
 
 if [[ -f automation/$automation && $(basename $automation) == $automation ]]; then
@@ -389,7 +393,6 @@ fi
 	set_progress_str 9 'Initializing Salt minion'
 	configure_minion "$minion_type" >> $setup_log 2>&1
 
-
 	if [[ $is_master || $is_helix ]]; then
 		set_progress_str 10 'Configuring Salt master'
 		create_local_directories >> $setup_log 2>&1