Now only catching intentionally thrown exceptions.
fixes #1