Add check for null usernames