Capture some spurious exceptions.
Merge remote-tracking branch 'origin/master' into macosx-support