SimpleTypesPrimitiveTypeMapper.computeSupertype() throws NPE if passed any `null` type

[enikao]

In some edge cases, we calculate null as type. If that's passed to computeSupertype(), we're getting an NPE. Instead, null should be ignored.