diff --git a/chrome/content/thundersec.js b/chrome/content/thundersec.js
index b20aa82..2cabfa8 100644
--- a/chrome/content/thundersec.js
+++ b/chrome/content/thundersec.js
@@ -765,7 +765,16 @@ function pluginMain() {
     }
     updateDNSBLinfo(mailID);
 
+    if (!gFolderDisplay) {
+      return
+    }
+
     let msgHdr = gFolderDisplay.selectedMessage;
+
+    if (!msgHdr) {
+      return
+    }
+ 
     MsgHdrToMimeMessage(msgHdr, null, function (aMsgHdr, aMimeMsg) {
        // Update counters
       stats.inspectTotal++;
diff --git a/install.rdf b/install.rdf
index 56c507a..a3c2abe 100644
--- a/install.rdf
+++ b/install.rdf
@@ -4,7 +4,7 @@
     <Description about="urn:mozilla:install-manifest">
         <em:type>2</em:type> <!-- 2 : Extension -->
         <em:id>thundersec@community</em:id>
-        <em:version>1.0.1</em:version>
+        <em:version>1.0.2</em:version>
         <em:name>ThunderSec</em:name>
         <em:description>Provides security features for Mozilla Thunderbird. These include DNSBL and RBL support, DKIM and SPF failure verifications. DNSBL support can be used to leverage Spamhaus, Abuse.ch and other DNSBL/RBL databases, including custom ones.</em:description>
         <em:iconURL>chrome://thundersec/content/images/thundersec.png</em:iconURL>