Handle User.DoesNotExist
Merge pull request #1 from mbi/master

Handle User.DoesNotExist