Handle $user = null better