[PLAT-6805] Adding checks to handles cases with stubs and notional exchanges properly