diff --git a/lib/SNMP/Info/Layer2/Telindus.pm b/lib/SNMP/Info/Layer2/Telindus.pm
index 5d8805ae..3b98ff7e 100755
--- a/lib/SNMP/Info/Layer2/Telindus.pm
+++ b/lib/SNMP/Info/Layer2/Telindus.pm
@@ -41,17 +41,22 @@ sub os {
 sub os_ver {
     my $obj = shift;
     $obj->description =~ /\$Telindus\s(\d+)(\$\s(.*)|\s(.*)\$)\s(T\d+\/\d+)/;
-    return $5;
+    return $5
+        if defined $5;
+
+    return $obj->SUPER::os_ver();
 }
 sub model {
     my $obj = shift;
     $obj->description =~ /\$Telindus\s(\d+)(\$\s(.*)|\s(.*)\$)\s(T\d+\/\d+)/;
-    if (defined $3) {
+    if (defined $1 and defined $3) {
         return $1 . ' ' . $3;
     }
-    else {
+    elsif (defined $1 and defined $4) {
         return $1 . ' ' . $4;
     }
+
+    return $obj->SUPER::model();
 }
 
 1;