Robustified the new data add code.