merging working and tested
make sure oids are valid before trying resolve them
more resilient handling of invalid user entered oids