User might be null
Merge pull request #1 from pjcunningham/master

User might be null