#45. Possible fix for null:{user name}