Get a little smarter with rebase error handling