Fix for null pointer exception from UserAware
Merge pull request #430 from mangecoeur/fix-useraware

#429 Fix for null pointer exception from UserAware