Revert "Switched to do ing a proper catch block instead of the little tweak we did to make tests pass"

This reverts commit fdf8f9fed5a78e50555c56453cb6982de7fb8058.
Revert "changed e.getCause to e when checking for exception instance"

This reverts commit b8c193ff590281797065a765f306bb7e05582cf2.
This is a psuedo cherry pick. A bunch of stuff happened in the future to repose vavle tes, so i couldn't just cherry-pick the one thing. Instead i aded this line which i beleive is the minimal i need of those changes to get the tests working.