Additional check for null/undefined.