diff --git a/extensions/mssql/src/cms/cmsService.ts b/extensions/mssql/src/cms/cmsService.ts
index 402f988bcb..5f5774348a 100644
--- a/extensions/mssql/src/cms/cmsService.ts
+++ b/extensions/mssql/src/cms/cmsService.ts
@@ -42,7 +42,7 @@ export class CmsService implements ICmsService {
 			},
 			e => {
 				this.client.logFailedRequest(contracts.CreateCentralManagementServerRequest.type, e);
-				return Promise.reject(new Error(e.message));
+				return Promise.reject(e);
 			}
 		);
 	}
@@ -55,7 +55,7 @@ export class CmsService implements ICmsService {
 			},
 			e => {
 				this.client.logFailedRequest(contracts.ListRegisteredServersRequest.type, e);
-				return Promise.reject(new Error(e.message));
+				return Promise.reject(e);
 			}
 		);
 	}
@@ -68,7 +68,7 @@ export class CmsService implements ICmsService {
 			},
 			e => {
 				this.client.logFailedRequest(contracts.AddRegisteredServerRequest.type, e);
-				return Promise.reject(new Error(e.message));
+				return Promise.reject(e);
 			}
 		);
 	}
@@ -81,7 +81,7 @@ export class CmsService implements ICmsService {
 			},
 			e => {
 				this.client.logFailedRequest(contracts.RemoveRegisteredServerRequest.type, e);
-				return Promise.reject(new Error(e.message));
+				return Promise.reject(e);
 			}
 		);
 	}
diff --git a/extensions/mssql/src/dacfx/dacFxService.ts b/extensions/mssql/src/dacfx/dacFxService.ts
index e4ee892247..dbb7aa59c2 100644
--- a/extensions/mssql/src/dacfx/dacFxService.ts
+++ b/extensions/mssql/src/dacfx/dacFxService.ts
@@ -38,7 +38,7 @@ export class DacFxService implements mssql.IDacFxService {
 			undefined,
 			e => {
 				this.client.logFailedRequest(contracts.ExportRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(e);
 			}
 		);
 	}
@@ -49,7 +49,7 @@ export class DacFxService implements mssql.IDacFxService {
 			undefined,
 			e => {
 				this.client.logFailedRequest(contracts.ImportRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(undefined);
 			}
 		);
 	}
@@ -60,7 +60,7 @@ export class DacFxService implements mssql.IDacFxService {
 			undefined,
 			e => {
 				this.client.logFailedRequest(contracts.ExtractRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(undefined);
 			}
 		);
 	}
@@ -71,7 +71,7 @@ export class DacFxService implements mssql.IDacFxService {
 			undefined,
 			e => {
 				this.client.logFailedRequest(contracts.ExtractRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(undefined);
 			}
 		);
 	}
@@ -82,7 +82,7 @@ export class DacFxService implements mssql.IDacFxService {
 			undefined,
 			e => {
 				this.client.logFailedRequest(contracts.DeployRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(undefined);
 			}
 		);
 	}
@@ -93,7 +93,7 @@ export class DacFxService implements mssql.IDacFxService {
 			undefined,
 			e => {
 				this.client.logFailedRequest(contracts.GenerateDeployScriptRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(undefined);
 			}
 		);
 	}
@@ -104,7 +104,7 @@ export class DacFxService implements mssql.IDacFxService {
 			undefined,
 			e => {
 				this.client.logFailedRequest(contracts.GenerateDeployPlanRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(undefined);
 			}
 		);
 	}
@@ -115,7 +115,7 @@ export class DacFxService implements mssql.IDacFxService {
 			undefined,
 			e => {
 				this.client.logFailedRequest(contracts.GetOptionsFromProfileRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(undefined);
 			}
 		);
 	}
@@ -126,7 +126,7 @@ export class DacFxService implements mssql.IDacFxService {
 			undefined,
 			e => {
 				this.client.logFailedRequest(contracts.ValidateStreamingJobRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(undefined);
 			}
 		);
 	}
diff --git a/extensions/mssql/src/errorDiagnostics/errorDiagnosticsProvider.ts b/extensions/mssql/src/errorDiagnostics/errorDiagnosticsProvider.ts
index d86f5f0844..18bb545bf3 100644
--- a/extensions/mssql/src/errorDiagnostics/errorDiagnosticsProvider.ts
+++ b/extensions/mssql/src/errorDiagnostics/errorDiagnosticsProvider.ts
@@ -136,5 +136,9 @@ export class ErrorDiagnosticsProvider extends SqlOpsFeature<any> {
 		super(client, ErrorDiagnosticsProvider.messagesTypes);
 	}
 
-	protected registerProvider(options: any): Disposable { return undefined; }
+	protected registerProvider(options: any): Disposable {
+		return {
+			dispose: () => { }
+		}
+	}
 }
diff --git a/extensions/mssql/src/resourceProvider/resourceProvider.ts b/extensions/mssql/src/resourceProvider/resourceProvider.ts
index db74802c1f..f563ee2049 100644
--- a/extensions/mssql/src/resourceProvider/resourceProvider.ts
+++ b/extensions/mssql/src/resourceProvider/resourceProvider.ts
@@ -65,8 +65,8 @@ function asCreateFirewallRuleParams(account: azdata.Account, params: azdata.Fire
 		account: account,
 		firewallRuleName: params.firewallRuleName,
 		serverName: params.serverName,
-		startIpAddress: params.startIpAddress,
-		endIpAddress: params.endIpAddress,
+		startIpAddress: params.startIpAddress || '',
+		endIpAddress: params.endIpAddress || '',
 		securityTokenMappings: params.securityTokenMappings
 	};
 }
diff --git a/extensions/mssql/src/schemaCompare/schemaCompareService.ts b/extensions/mssql/src/schemaCompare/schemaCompareService.ts
index 67544ea2fe..ec19651573 100644
--- a/extensions/mssql/src/schemaCompare/schemaCompareService.ts
+++ b/extensions/mssql/src/schemaCompare/schemaCompareService.ts
@@ -38,7 +38,7 @@ export class SchemaCompareService implements mssql.ISchemaCompareService {
 			undefined,
 			e => {
 				this.client.logFailedRequest(contracts.SchemaCompareRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(e)
 			}
 		);
 	}
@@ -49,7 +49,7 @@ export class SchemaCompareService implements mssql.ISchemaCompareService {
 			undefined,
 			e => {
 				this.client.logFailedRequest(contracts.SchemaCompareGenerateScriptRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(e)
 			}
 		);
 	}
@@ -60,7 +60,7 @@ export class SchemaCompareService implements mssql.ISchemaCompareService {
 			undefined,
 			e => {
 				this.client.logFailedRequest(contracts.SchemaComparePublishDatabaseChangesRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(e)
 			}
 		);
 	}
@@ -71,7 +71,7 @@ export class SchemaCompareService implements mssql.ISchemaCompareService {
 			undefined,
 			(e: any) => {
 				this.client.logFailedRequest(contracts.SchemaComparePublishProjectChangesRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(e)
 			}
 		);
 	}
@@ -82,7 +82,7 @@ export class SchemaCompareService implements mssql.ISchemaCompareService {
 			undefined,
 			e => {
 				this.client.logFailedRequest(contracts.SchemaCompareGetDefaultOptionsRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(e)
 			}
 		);
 	}
@@ -93,7 +93,7 @@ export class SchemaCompareService implements mssql.ISchemaCompareService {
 			undefined,
 			e => {
 				this.client.logFailedRequest(contracts.SchemaCompareIncludeExcludeNodeRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(e)
 			}
 		);
 	}
@@ -104,7 +104,7 @@ export class SchemaCompareService implements mssql.ISchemaCompareService {
 			undefined,
 			e => {
 				this.client.logFailedRequest(contracts.SchemaCompareOpenScmpRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(e)
 			}
 		);
 	}
@@ -115,7 +115,7 @@ export class SchemaCompareService implements mssql.ISchemaCompareService {
 			undefined,
 			e => {
 				this.client.logFailedRequest(contracts.SchemaCompareSaveScmpRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(e)
 			}
 		);
 	}
@@ -126,7 +126,7 @@ export class SchemaCompareService implements mssql.ISchemaCompareService {
 			undefined,
 			e => {
 				this.client.logFailedRequest(contracts.SchemaCompareCancellationRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(e)
 			}
 		);
 	}