diff --git a/CHANGELOG.md b/CHANGELOG.md
index b760bc2..7441692 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Release Notes
 
+**v2.0.3:**
+- fixed bug with `Buffer` introduced in `v2.0.2`
+
 **v2.0.2:**
 - some more preparations and debugging for upcoming CORS implementation
 - added support for `Buffer` in web extension
diff --git a/package.json b/package.json
index c4b80ab..05a2dbf 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
 	"name": "databricks-vscode",
 	"displayName": "Databricks Power Tools",
 	"description": "Run notebooks cell-by-cell, browse and edit your Databricks Workspace, DBFS, Clusters, Jobs, Secrets, Repos and SQL. Supports Azure Databricks, Databricks on AWS and Databricks on GCP.",
-	"version": "2.0.2",
+	"version": "2.0.3",
 	"publisher": "paiqo",
 	"icon": "resources/databricks_extension.png",
 	"author": {
@@ -867,7 +867,7 @@
 				},
 				{
 					"command": "databricksConnections.add",
-					"when": "view == databricksConnections && virtualWorkspace && paiqo.databricks.connectionManager == 'Manual'",
+					"when": "view == databricksConnections && virtualWorkspace",
 					"group": "navigation"
 				},
 				{
diff --git a/src/ThisExtension.ts b/src/ThisExtension.ts
index db50bf1..0bdc184 100644
--- a/src/ThisExtension.ts
+++ b/src/ThisExtension.ts
@@ -75,7 +75,11 @@ export abstract class ThisExtension {
 			// handle default
 			if (conManager == "Default") {
 				ThisExtension.log("Default connection manager selected. Trying to find the best connection manager ...")
-				if (vscode.extensions.getExtension("databricks.databricks")) {
+				if(ThisExtension.isInBrowser) {
+					ThisExtension.log("Using Manual connection manager as its the only one currently available in the browser ...");
+					conManager = "Manual";
+				}
+				else if (vscode.extensions.getExtension("databricks.databricks")) {
 					ThisExtension.log("Databricks Extension found. Using it as connection manager ...");
 					conManager = "Databricks Extension";
 				}
diff --git a/src/env/node/buffer.ts b/src/env/node/buffer.ts
index 7398594..fbbc7fc 100644
--- a/src/env/node/buffer.ts
+++ b/src/env/node/buffer.ts
@@ -1 +1,3 @@
-export { Buffer };
\ No newline at end of file
+const Buffer_Node = Buffer;
+
+export { Buffer_Node as Buffer };
\ No newline at end of file
diff --git a/src/extension.ts b/src/extension.ts
index a155f1b..8dadcef 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -53,8 +53,13 @@ export async function activate(context: vscode.ExtensionContext) {
 
 	let isValidated: boolean = await ThisExtension.initialize(context);
 	if (isValidated === false) {
-		ThisExtension.log("Issue initializing extension - Please update Databricks settings and restart VSCode!");
-		vscode.window.showErrorMessage("Issue initializing extension - Please update Databricks settings and restart VSCode!");
+		const msg = "Issue initializing extension - Please update Databricks settings and restart VSCode!"
+		ThisExtension.log(msg);
+		vscode.window.showErrorMessage(msg);
+
+		ThisExtension.setStatusBar("ERROR!");
+
+		throw new Error(msg);
 	}
 
 	ThisExtension.setStatusBar("Initialized!");
diff --git a/src/vscode/treeviews/connections/DatabricksConnectionManagerManualInput.ts b/src/vscode/treeviews/connections/DatabricksConnectionManagerManualInput.ts
index f2fc49a..46dd2a3 100644
--- a/src/vscode/treeviews/connections/DatabricksConnectionManagerManualInput.ts
+++ b/src/vscode/treeviews/connections/DatabricksConnectionManagerManualInput.ts
@@ -24,6 +24,8 @@ export class DatabricksConnectionManagerManualInput extends DatabricksConnection
 			let msg: string = "No connections have been configured yet! Please add a connection manually before proceeding!";
 			ThisExtension.log(msg);
 			vscode.window.showErrorMessage(msg);
+
+			throw new Error(msg);
 		}
 		else {
 			await super.manageLastActiveConnection();