Improved detection of null values in the type assertions. #13