Fix returning list with null if user returned is null