Fix return of null when no user is found