refactoring: more fault tolerant OC parsing