Clean up catching of Throwable, use Exception instead.