Don't catch all exceptions.
Merge pull request #2082 from edx/ned/dont-catch-all-exceptions

Don't catch all exceptions.