OID stuff moved back inside try clause