diff --git a/drivers/bookmarklet/js/wappalyzer.js b/drivers/bookmarklet/js/wappalyzer.js
index 351c923b8..b3f81db41 100644
--- a/drivers/bookmarklet/js/wappalyzer.js
+++ b/drivers/bookmarklet/js/wappalyzer.js
@@ -302,7 +302,7 @@ var wappalyzer = (function() {
 				if ( typeof data.html === 'string' && data.html ) {
 					match = data.html.match(/<html[^>]*[: ]lang="([a-z]{2}((-|_)[A-Z]{2})?)"/i);
 
-					if ( match.length ) {
+					if ( match && match.length ) {
 						w.ping.hostnames[hostname].meta['language'] = match[1];
 					}
 
diff --git a/drivers/chrome/js/wappalyzer.js b/drivers/chrome/js/wappalyzer.js
index 351c923b8..b3f81db41 100644
--- a/drivers/chrome/js/wappalyzer.js
+++ b/drivers/chrome/js/wappalyzer.js
@@ -302,7 +302,7 @@ var wappalyzer = (function() {
 				if ( typeof data.html === 'string' && data.html ) {
 					match = data.html.match(/<html[^>]*[: ]lang="([a-z]{2}((-|_)[A-Z]{2})?)"/i);
 
-					if ( match.length ) {
+					if ( match && match.length ) {
 						w.ping.hostnames[hostname].meta['language'] = match[1];
 					}
 
diff --git a/drivers/firefox-jetpack/lib/wappalyzer.js b/drivers/firefox-jetpack/lib/wappalyzer.js
index 351c923b8..b3f81db41 100644
--- a/drivers/firefox-jetpack/lib/wappalyzer.js
+++ b/drivers/firefox-jetpack/lib/wappalyzer.js
@@ -302,7 +302,7 @@ var wappalyzer = (function() {
 				if ( typeof data.html === 'string' && data.html ) {
 					match = data.html.match(/<html[^>]*[: ]lang="([a-z]{2}((-|_)[A-Z]{2})?)"/i);
 
-					if ( match.length ) {
+					if ( match && match.length ) {
 						w.ping.hostnames[hostname].meta['language'] = match[1];
 					}
 
diff --git a/drivers/firefox/content/js/wappalyzer.js b/drivers/firefox/content/js/wappalyzer.js
index 351c923b8..b3f81db41 100644
--- a/drivers/firefox/content/js/wappalyzer.js
+++ b/drivers/firefox/content/js/wappalyzer.js
@@ -302,7 +302,7 @@ var wappalyzer = (function() {
 				if ( typeof data.html === 'string' && data.html ) {
 					match = data.html.match(/<html[^>]*[: ]lang="([a-z]{2}((-|_)[A-Z]{2})?)"/i);
 
-					if ( match.length ) {
+					if ( match && match.length ) {
 						w.ping.hostnames[hostname].meta['language'] = match[1];
 					}
 
diff --git a/drivers/firefox/skin/images/icon128.png b/drivers/firefox/skin/images/icon128.png
new file mode 100644
index 000000000..a72b1c8af
Binary files /dev/null and b/drivers/firefox/skin/images/icon128.png differ
diff --git a/drivers/firefox/skin/images/icon32.png b/drivers/firefox/skin/images/icon32.png
new file mode 100644
index 000000000..e554cd3ef
Binary files /dev/null and b/drivers/firefox/skin/images/icon32.png differ
diff --git a/drivers/firefox/skin/images/icon64.png b/drivers/firefox/skin/images/icon64.png
new file mode 100644
index 000000000..58d6a0edc
Binary files /dev/null and b/drivers/firefox/skin/images/icon64.png differ
diff --git a/drivers/html/js/wappalyzer.js b/drivers/html/js/wappalyzer.js
index 351c923b8..b3f81db41 100644
--- a/drivers/html/js/wappalyzer.js
+++ b/drivers/html/js/wappalyzer.js
@@ -302,7 +302,7 @@ var wappalyzer = (function() {
 				if ( typeof data.html === 'string' && data.html ) {
 					match = data.html.match(/<html[^>]*[: ]lang="([a-z]{2}((-|_)[A-Z]{2})?)"/i);
 
-					if ( match.length ) {
+					if ( match && match.length ) {
 						w.ping.hostnames[hostname].meta['language'] = match[1];
 					}
 
diff --git a/drivers/php/js/wappalyzer.js b/drivers/php/js/wappalyzer.js
index 351c923b8..b3f81db41 100644
--- a/drivers/php/js/wappalyzer.js
+++ b/drivers/php/js/wappalyzer.js
@@ -302,7 +302,7 @@ var wappalyzer = (function() {
 				if ( typeof data.html === 'string' && data.html ) {
 					match = data.html.match(/<html[^>]*[: ]lang="([a-z]{2}((-|_)[A-Z]{2})?)"/i);
 
-					if ( match.length ) {
+					if ( match && match.length ) {
 						w.ping.hostnames[hostname].meta['language'] = match[1];
 					}
 
diff --git a/share/js/wappalyzer.js b/share/js/wappalyzer.js
index 351c923b8..b3f81db41 100644
--- a/share/js/wappalyzer.js
+++ b/share/js/wappalyzer.js
@@ -302,7 +302,7 @@ var wappalyzer = (function() {
 				if ( typeof data.html === 'string' && data.html ) {
 					match = data.html.match(/<html[^>]*[: ]lang="([a-z]{2}((-|_)[A-Z]{2})?)"/i);
 
-					if ( match.length ) {
+					if ( match && match.length ) {
 						w.ping.hostnames[hostname].meta['language'] = match[1];
 					}