Add sanity checks to get_property_data_message and contribute fixing