Add null checks for all non-nullable properties.