Improve error handling when updating branch mappings

[dregad]

At the moment, the code just calls die with an error message when validation fails. Proper errors should be triggered instead.