Safer UMD wrapper