Fix the NULL case