Only modify if no errors