diff --git a/src/SelfServe/SelfServeComponent.tsx b/src/SelfServe/SelfServeComponent.tsx
index 732c5df17..c9ddc9371 100644
--- a/src/SelfServe/SelfServeComponent.tsx
+++ b/src/SelfServe/SelfServeComponent.tsx
@@ -166,7 +166,7 @@ export class SelfServeComponent extends React.Component<SelfServeComponentProps,
     const { baselineValues } = this.state;
     for (const key of currentValues.keys()) {
       const baselineValue = baselineValues.get(key);
-      currentValues = currentValues.set(key, { ...baselineValue });
+      currentValues = currentValues.set(key, baselineValue ? { ...baselineValue } : baselineValue);
     }
     this.setState({ currentValues });
   };
diff --git a/src/SelfServe/SqlX/SqlX.rp.ts b/src/SelfServe/SqlX/SqlX.rp.ts
index 2bc7a70fa..365422c57 100644
--- a/src/SelfServe/SqlX/SqlX.rp.ts
+++ b/src/SelfServe/SqlX/SqlX.rp.ts
@@ -50,6 +50,7 @@ export const updateDedicatedGatewayResource = async (sku: string, instances: num
   } catch (e) {
     const failureTelemetry = { ...body, e, selfServeClassName: SqlX.name };
     selfServeTraceFailure(failureTelemetry, updateTimeStamp);
+    throw e;
   }
   return armRequestResult?.operationStatusUrl;
 };
@@ -70,6 +71,7 @@ export const deleteDedicatedGatewayResource = async (): Promise<string> => {
   } catch (e) {
     const failureTelemetry = { e, selfServeClassName: SqlX.name };
     selfServeTraceFailure(failureTelemetry, deleteTimeStamp);
+    throw e;
   }
   return armRequestResult?.operationStatusUrl;
 };
@@ -90,6 +92,7 @@ export const getDedicatedGatewayResource = async (): Promise<SqlxServiceResource
   } catch (e) {
     const failureTelemetry = { e, selfServeClassName: SqlX.name };
     selfServeTraceFailure(failureTelemetry, getResourceTimeStamp);
+    throw e;
   }
   return armRequestResult?.result;
 };