Changed exception handling to handle invalid users