Add additional null-type check