Final null user fix

Finally found a fix for the null user bug caused by closing the browser
window while waiting for a client.