fix to check null value for all type fields, not only stringVal (behavior of HS2 changed?)