Merge "qdutils: correct error checking of MetaData's handle mapping"