am 6e4d5db1: Fix two error-case unwinders.

* commit '6e4d5db1b11f808bb4bdcc8dd45a7158c6c88515':
  Fix two error-case unwinders.