diff --git a/includes/discovery/temperatures/cisco-envmon.inc.php b/includes/discovery/temperatures/cisco-envmon.inc.php
index 998e9916f1..a9e07fcc30 100644
--- a/includes/discovery/temperatures/cisco-envmon.inc.php
+++ b/includes/discovery/temperatures/cisco-envmon.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+## FIXME - dbFacile and fewer SNMP_GETs
+
 if (mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors` WHERE `device_id` = '".$device['device_id']."' AND `sensor_class` = 'temperature' AND (`sensor_type` = 'cisco-entity-sensor' OR `sensor_type` = 'entity-sensor')"),0) == "0" && ($device['os_group'] == "cisco"))
 {
   echo("CISCO-ENVMON-MIB: ");
@@ -16,7 +18,7 @@ if (mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors` WHERE `device_id` =
       $descr_oid = ".1.3.6.1.4.1.9.9.13.1.3.1.2.$index";
       $descr = snmp_get($device, $descr_oid, "-Oqv", "CISCO-ENVMON-MIB");
       $temperature = snmp_get($device, $oid, "-Oqv", "CISCO-ENVMON-MIB");
-      if (!strstr($descr, "No") && !strstr($temperature, "No") && $descr != "")
+      if (!strstr($descr, "No") && !strstr($temperature, "No") && $temperature != "" && $descr != "")
       {
         $descr = str_replace("\"", "", $descr);
         $descr = str_replace("temperature", "", $descr);