Fix rethrowing for 3