Add strict comparison and remove check against null as it's included in instanceof