Emergency fix for invalid usernames, fix for NPE