Yeah, I have a commit pending (make test) that takes care of all this and of moving traces OID+isEmpty  stuff outside the try/catch.