Improves security error catching
Merge pull request #634 from stellar/swallow-more-errors

Improves security error catching