Better matching of UUIDs and explicit 404 test

Tested-by: Mark Somerville <mark@crocodile.is> [Arch, MRI 2.1.1]
Signed-off-by: Mark Somerville <mark@crocodile.is>