Updated Exception handling
Corrected logic bugs
checking for password now