Make no assumption about user's existence
Merge pull request #23 from sorenh/master

Make no assumption about user's existence