Add special case for null/undefined.