Bugfix and robustness in branch closing
This brings in a fix for one of the case of heptapod#452 (closed) and hopefully unblocks the other ones while providing useful tracebacks.
This brings in a fix for one of the case of heptapod#452 (closed) and hopefully unblocks the other ones while providing useful tracebacks.