diff --git a/src/pam_panic/pam_panic.c b/src/pam_panic/pam_panic.c
index 5e15d3e..37f8072 100644
--- a/src/pam_panic/pam_panic.c
+++ b/src/pam_panic/pam_panic.c
@@ -71,7 +71,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags,	int argc, cons
   // Regex for checking arguments
   regex_t regex;
   if(makeRegex(pamh, &regex))
-    return (PAM_IGNORE);
+    return (PAM_ABORT);
 
 
   // Argument handling
@@ -108,7 +108,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags,	int argc, cons
       || (bSerious && serious_temp == NULL)
     ) {
     pam_syslog(pamh, LOG_ERR, "Arguments invalid. Note that allow and reject must have a valid GPT UUID.");
-    return (PAM_IGNORE);
+    return (PAM_ABORT);
   } 
 
   // Poweroff wins.
@@ -144,7 +144,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags,	int argc, cons
   // Check if panic key exist
   if(bSerious && access(serious_dev, F_OK) == -1){
     pam_syslog(pamh, LOG_ALERT, "ALERT for argument \"serious\": Device doesn't exist.");
-    return (PAM_IGNORE);
+    return (PAM_ABORT);
   }
 
 
@@ -159,7 +159,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags,	int argc, cons
     return authPassword(pamh, serious_dev, bSerious, bReboot, bPoweroff); 
   }
   
-  return (PAM_IGNORE);  
+  return (PAM_ABORT);  
 
 }
 
diff --git a/src/pam_panic/pam_panic_password.c b/src/pam_panic/pam_panic_password.c
index 4af21e4..d9656fc 100644
--- a/src/pam_panic/pam_panic_password.c
+++ b/src/pam_panic/pam_panic_password.c
@@ -76,11 +76,16 @@ int authPassword(pam_handle_t *pamh, char *serious_dev, int8_t bSerious, int8_t
   // Read passwords from file
   char pw[2][99];
   if(readPassword(pamh, pw))
-    return(PAM_IGNORE);
+    return(PAM_ABORT);
 
 
 
-  pam_prompt(pamh, PAM_PROMPT_ECHO_OFF, &response, "Password:: ");
+  pam_prompt(pamh, PAM_PROMPT_ECHO_OFF, &response, PWPROMPT);
+
+  // Is response null?
+  if(!response)
+    return(PAM_ABORT);
+
   strcpy(resp, response);
  
 
diff --git a/src/pam_panic/pam_panic_password.h b/src/pam_panic/pam_panic_password.h
index 7ecf411..6476554 100644
--- a/src/pam_panic/pam_panic_password.h
+++ b/src/pam_panic/pam_panic_password.h
@@ -10,6 +10,7 @@ LICENSE :      GNU-GPLv3
 #ifndef PPASSFILE
   #error PPASSFILE must be declared!
 #endif
+#define PWPROMPT "Password::"
 
 int authPassword(pam_handle_t *pamh, char *serious_dev, int8_t bSerious, int8_t bReboot, int8_t bPoweroff);