Add more gracious exception handling for when partial changes are saved