Updates to re-throw when catching ... to avoid a fatal: exception not rethrown error.