added NSNull class check for property with NSNull value