r20275: we should check for the oid the caller gave us!