Added some security around OV removal.