Fixed showing generic errors.
Trying to handle a case where a user did not have their user account created.
Merge remote-tracking branch 'origin/master'