fixing handling of null and undefined