Better exception handling
Fix password reset