Branch out on error

:bug:

Branch out on error.

/cc @maximeprades