Give users a better error message on invalid branches. Only log a warning instead of an exception.

Reviewers: cramer

Reviewed By: cramer

Differential Revision: https://tails.corp.dropbox.com/D62995