BUG-981: harden exception handling

No match.