#429 Fix for null pointer exception from UserAware

Fix for #429