Correct NPE when user doesn't have an initial session