Remove catch-rethrow in Driver