Better type checking for Null types

Better type checking for Null types #574