Fixed null as an object type issue