Add null checks for all properties.