Revert previous commit, since Throwable is already being caught.

This reverts commit 1304161ecc403ec04e1b896cc825c60364a66a4c.