The InvalidSourceException was still being triggered, @anirudhtodi was testing and could still see it being hit. Could you confirm that @anirudhtodi ?