Fix NullPointerException in OContainerRepair