diff --git a/src/vs/platform/remote/common/remoteAuthorityResolver.ts b/src/vs/platform/remote/common/remoteAuthorityResolver.ts
index 0f05864a61d4ca49e8b53a4d682b566b9c500e4e..786adeba46b7836a017efef231c9bb2d6f919dd5 100644
--- a/src/vs/platform/remote/common/remoteAuthorityResolver.ts
+++ b/src/vs/platform/remote/common/remoteAuthorityResolver.ts
@@ -40,28 +40,24 @@ export enum RemoteAuthorityResolverErrorCode {
 
 export class RemoteAuthorityResolverError extends Error {
 
-	public static isHandledNotAvailable(err: any): boolean {
-		if (err instanceof RemoteAuthorityResolverError) {
-			if (err._code === RemoteAuthorityResolverErrorCode.NotAvailable && err._detail === true) {
-				return true;
-			}
-		}
-
-		return this.isTemporarilyNotAvailable(err);
-	}
-
 	public static isTemporarilyNotAvailable(err: any): boolean {
 		return (err instanceof RemoteAuthorityResolverError) && err._code === RemoteAuthorityResolverErrorCode.TemporarilyNotAvailable;
 	}
 
-	public static isNoResolverFound(err: any): boolean {
+	public static isNoResolverFound(err: any): err is RemoteAuthorityResolverError {
 		return (err instanceof RemoteAuthorityResolverError) && err._code === RemoteAuthorityResolverErrorCode.NoResolverFound;
 	}
 
+	public static isHandled(err: any): boolean {
+		return (err instanceof RemoteAuthorityResolverError) && err.isHandled;
+	}
+
 	public readonly _message: string | undefined;
 	public readonly _code: RemoteAuthorityResolverErrorCode;
 	public readonly _detail: any;
 
+	public isHandled: boolean;
+
 	constructor(message?: string, code: RemoteAuthorityResolverErrorCode = RemoteAuthorityResolverErrorCode.Unknown, detail?: any) {
 		super(message);
 
@@ -69,6 +65,8 @@ export class RemoteAuthorityResolverError extends Error {
 		this._code = code;
 		this._detail = detail;
 
+		this.isHandled = (code === RemoteAuthorityResolverErrorCode.NotAvailable) && detail === true;
+
 		// workaround when extending builtin objects and when compiling to ES5, see:
 		// https://github.com/Microsoft/TypeScript-wiki/blob/master/Breaking-Changes.md#extending-built-ins-like-error-array-and-map-may-no-longer-work
 		if (typeof (<any>Object).setPrototypeOf === 'function') {
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
index b4a88b0a3639f2ecdd6d53cb2a20f77dd8e52fd1..0da45d75af53660407bcf861120aee1fa84350ef 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
@@ -459,16 +459,13 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 			} catch (err) {
 				const remoteName = getRemoteName(remoteAuthority);
 				if (RemoteAuthorityResolverError.isNoResolverFound(err)) {
-					this._handleNoResolverFound(remoteName, allExtensions);
+					err.isHandled = await this._handleNoResolverFound(remoteName, allExtensions);
 				} else {
 					console.log(err);
-					if (RemoteAuthorityResolverError.isHandledNotAvailable(err)) {
-						console.log(`Not showing a notification for the error`);
-					} else {
-						this._notificationService.notify({ severity: Severity.Error, message: nls.localize('resolveAuthorityFailure', "Resolving the authority `{0}` failed", remoteName) });
+					if (RemoteAuthorityResolverError.isHandled(err)) {
+						console.log(`Error handled: Not showing a notification for the error`);
 					}
 				}
-
 				this._remoteAuthorityResolverService.setResolvedAuthorityError(remoteAuthority, err);
 
 				// Proceed with the local extension host
@@ -584,10 +581,10 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 		}
 	}
 
-	private async _handleNoResolverFound(remoteName: string, allExtensions: IExtensionDescription[]): Promise<void> {
+	private async _handleNoResolverFound(remoteName: string, allExtensions: IExtensionDescription[]): Promise<boolean> {
 		const recommendation = this._productService.remoteExtensionTips?.[remoteName];
 		if (!recommendation) {
-			return;
+			return false;
 		}
 		const sendTelemetry = (userReaction: 'install' | 'enable' | 'cancel') => {
 			/* __GDPR__
@@ -641,6 +638,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 			);
 
 		}
+		return true;
 
 	}
 }
diff --git a/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts b/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
index a97aaafe97d833cf7899d864928d29ff401e57cd..bf8e93ea187388b904780cf10b39de22094ff17c 100644
--- a/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
+++ b/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
@@ -164,7 +164,7 @@ class RemoteConnectionFailureNotificationContribution implements IWorkbenchContr
 		// Let's cover the case where connecting to fetch the remote extension info fails
 		remoteAgentService.getEnvironment(true)
 			.then(undefined, err => {
-				if (!RemoteAuthorityResolverError.isHandledNotAvailable(err)) {
+				if (!RemoteAuthorityResolverError.isHandled(err)) {
 					notificationService.error(nls.localize('connectionError', "Failed to connect to the remote extension host server (Error: {0})", err ? err.message : ''));
 				}
 			});