Correct map null condition