#2860 - fix rethrow + add tests to avoid regression.