Add null constraints to avoid broken records