diff --git a/modules/savebuff.cpp b/modules/savebuff.cpp
index 54e705db..21443265 100644
--- a/modules/savebuff.cpp
+++ b/modules/savebuff.cpp
@@ -61,13 +61,18 @@ public:
 			char *pPass = getpass( "Enter pass for savebuff: " );
 			if( pPass )
 				m_sPassword = CBlowfish::MD5( pPass );
+			else
+			{
+				m_bBootError = true;
+				sMessage = "Nothing retrieved from console. aborting";
+			}
 		}
 		else if( sArgs.empty() )
 			m_sPassword = CBlowfish::MD5( CRYPT_LAME_PASS ); 
 		else
 			m_sPassword = CBlowfish::MD5(sArgs);
 
-		return true;
+		return( !m_bBootError );
 	}
 
 	virtual void OnIRCConnected()
@@ -156,6 +161,10 @@ public:
 				}
 			}
 		}
+		else
+		{
+			PutModule( "Password is unset usually meaning the decryption failed. You can setpass to the appropriate pass and things should start working, or setpass to a new pass and save to reinstantiate" );
+		}
 	}
 
 	virtual void OnModCommand(const CString& sCmdLine)