Fixed null/undefined check