More null intent handling in authorization