fix for NPE in user handling