Add null checks for all properties that are not nullable.