Unhandled Error Cleanup

Currently sometimes the Git task can fail, and leaves us on the release/next branch. It would be nice if we could try and cleanup as much as possible.

And if it fails hard we will just keep it as is.