Merge "registration: Throw more obvious error when a file doesn't exist"