More exception handling around adding store in RO2 format