NPE in create user
Merge pull request #293 from patriot1burke/master

NPE in create user