Fxing VS crash on bundle delete + cancel bundling on checkout error (#1401)