diff --git a/includes/discovery/interfaces.php b/includes/discovery/interfaces.php
index 756f8b0c8a..e023ca544a 100755
--- a/includes/discovery/interfaces.php
+++ b/includes/discovery/interfaces.php
@@ -4,10 +4,8 @@
 
   echo("Interfaces : ");
 
-  $cmd  = ($device['snmpver'] == 'v1' ? $config['snmpwalk'] : $config['snmpbulkwalk']) . " -m IF-MIB -O nsq -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
-  $cmd .= " ifDescr";
-  if ($debug) echo("$cmd\n");
-  $interfaces = trim(shell_exec($cmd));
+  $interfaces = snmp_walk($device['hostname'], $device['port'], $device['snmpver'], $device['community'], "ifDescr", "Onsq", "IF-MIB");
+
   $interfaces = str_replace("\"", "", $interfaces);
   $interfaces = str_replace("ifDescr.", "", $interfaces);
   $interfaces = str_replace(" ", "||", $interfaces);
@@ -20,14 +18,6 @@
     $entry = trim($entry);
     list($ifIndex, $ifDescr) = explode("||", $entry);
 
-#    if($config['ifdescr'][$device['os']]) {
-#      $ifDescr = shell_exec($config['snmpget'] . " -m IF-MIB -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " ifDescr.$ifIndex");
-#      $ifDescr = str_replace("No Such Object available on this agent at this OID", "", $ifDescr);
-#      $ifDescr = str_replace("No Such Instance currently exists at this OID", "", $ifDescr);
-#      $ifDescr = trim(str_replace("\"", "", $ifDescr));
-#    } else { $ifDescr = trim(str_replace("\"", "", $ifName)); }
-
-
     if(!strstr($entry, "irtual")) {
       $if = trim(strtolower($ifDescr));
       $nullintf = 0;
diff --git a/includes/functions-poller.inc.php b/includes/functions-poller.inc.php
index bc05377bd3..e4573927b4 100644
--- a/includes/functions-poller.inc.php
+++ b/includes/functions-poller.inc.php
@@ -1,5 +1,23 @@
 <?php
 
+function snmp_walk($hostname, $port,$snmpver, $community, $oid, $options, $mib) {
+  global $debug; global $config; global $runtime_stats;
+  $cmd  = ($snmpver == 'v1' ? $config['snmpwalk'] : $config['snmpbulkwalk']) . " -" . $snmpver . " -c " . $community . " " . $hostname.":".$port . " ";
+  if($options) { $cmd .= "-$options "; }
+  if($mib) { $cmd .= "-m $mib "; }
+  $cmd .= $oid;
+  if($debug) { echo("$cmd\n"); }
+  $data = trim(shell_exec($cmd));
+  $runtime_stats['snmpwalk']++;
+  if($debug) { echo("$data\n"); }
+  if (is_string($result) && (preg_match("/No Such (Object|Instance)/i", $result) || preg_match("/No more variables left/i", $result)))
+  {
+    $result = false;
+  } else {
+    return $data;
+  }
+}
+
 function snmp_cache_cip($oid, $device, $array, $mib = 0) {
   global $config;
   $cmd  = ($device['snmpver'] == 'v1' ? $config['snmpwalk'] : $config['snmpbulkwalk']) . " -O snQ -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " ";