Four commands might well handle errors very badly:

• git-adjust
• git-multi-pick
• git-permute
• git-update

Check them and make sure they handle them. Some of the mechanism in git-save might be useful.