diff --git a/chrome/content/apps.js b/chrome/content/apps.js
index 3fee8f32d..272deb84c 100644
--- a/chrome/content/apps.js
+++ b/chrome/content/apps.js
@@ -67,7 +67,7 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'CS Cart':               { cats: { 1:  6 }, html: /&nbsp;Powered by (<a href=.http:\/\/www\.cs\-cart\.com|CS\-Cart)/i },
 		'CubeCart':              { cats: { 1:  6 }, html: /Powered by <a href=.http:\/\/www\.cubecart\.com/i },
 		'cufon':                 { cats: { 1: 17 }, html: /(<script[^>]* src=("|')[^>]*cufon\-yui\.js|<script[^>]*>[^<]+Cufon\.now\(\))/i },
-		'd3':                    { cats: { 1: 25 }, html: /<script[^>]*src=[^>]+d3[^>]*\.js/i, env: '/^d3$/' },
+		'd3':                    { cats: { 1: 25 }, html: /<script[^>]*src=[^>]+d3(\.min)?\.js/i, env: '/^d3$/' },
 		'Danneo CMS':            { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Danneo/i },
 		'DataLife Engine':       { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+DataLife Engine/i },
 		'DHTMLX':                { cats: { 1: 12 }, html: /<script [^>]+dhtmlxcommon\.js/i },
diff --git a/chrome/content/content.js b/chrome/content/content.js
index c7c23f1da..8ec2b7304 100644
--- a/chrome/content/content.js
+++ b/chrome/content/content.js
@@ -63,7 +63,7 @@
 		getEnvironmentVars: function() {
 			self.log('getEnvironmentVars');
 
-			if ( content.document.contentType != 'text/html' ) {
+			if ( content.document.contentType != 'text/html' || typeof content.document.html == 'undefined' ) {
 				return;
 			}