diff --git a/CHANGELOG b/CHANGELOG
index 5f83946..cdb1ca3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+0.4.4 (??-??-2017)
+=========================
+- Added support for OTP codes via context menu
+- Fixed HTTP auth
+
 0.4.3 (9-12-2017)
 =========================
 - Create password generator dialog only when clicking the icon
diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js
index ae435ac..b924fe7 100644
--- a/keepassxc-browser/background/keepass.js
+++ b/keepassxc-browser/background/keepass.js
@@ -131,7 +131,9 @@ keepass.addCredentials = function(callback, tab, username, password, url) {
 
 keepass.updateCredentials = function(callback, tab, entryId, username, password, url) {
 	page.debug('keepass.updateCredentials(callback, {1}, {2}, {3}, [password], {4})', tab.id, entryId, username, url);
-	page.tabs[tab.id].errorMessage = null;
+	if (tab && page.tabs[tab.id]) {
+		page.tabs[tab.id].errorMessage = null;
+	}
 
 	keepass.testAssociation((response) => {
 		if (!response) {
@@ -200,7 +202,9 @@ keepass.retrieveCredentials = function(callback, tab, url, submiturl, forceCallb
 			return;
 		}
 
-		page.tabs[tab.id].errorMessage = null;
+		if (tab && page.tabs[tab.id]) {
+			page.tabs[tab.id].errorMessage = null;
+		}
 
 		if (!keepass.isConnected) {
 			callback([]);
@@ -344,7 +348,9 @@ keepass.associate = function(callback, tab) {
 			return;
 		}
 
-		page.tabs[tab.id].errorMessage = null;
+		if (tab && page.tabs[tab.id]) {
+			page.tabs[tab.id].errorMessage = null;
+		}
 
 		const kpAction = kpActions.ASSOCIATE;
 		const key = nacl.util.encodeBase64(keepass.keyPair.publicKey);
diff --git a/keepassxc-browser/manifest.json b/keepassxc-browser/manifest.json
index e43a67e..be1c515 100644
--- a/keepassxc-browser/manifest.json
+++ b/keepassxc-browser/manifest.json
@@ -1,7 +1,7 @@
 {
 	"manifest_version": 2,
 	"name": "keepassxc-browser",
-	"version": "0.4.3",
+	"version": "0.4.4",
 	"description": "KeePassXC integration for modern web browsers",
 	"author": "Sami Vänttinen",
 	"icons": {