diff --git a/Info/Layer3/H3C.pm b/Info/Layer3/H3C.pm
index 99d4c8a3..c84ca3e4 100644
--- a/Info/Layer3/H3C.pm
+++ b/Info/Layer3/H3C.pm
@@ -82,7 +82,7 @@ $VERSION = '3.18';
 sub vendor {
     my $h3c = shift;
     my $mfg = $h3c->entPhysicalMfgName(1) || {};
-    return $mfg->{1};
+    return $mfg->{1} || "H3C";
 }
 
 sub os {
@@ -90,7 +90,7 @@ sub os {
     my $descr   = $h3c->description();
 
     return $1 if ( $descr =~ /(\S+)\s+Platform Software/ );
-    return;
+    return "H3C";
 }
 
 sub os_ver {
@@ -101,6 +101,7 @@ sub os_ver {
     my $os_ver  = undef;
 
     $os_ver = "$1 $2" if ( $descr =~ /Software Version ([^,]+),.*(Release\s\S+)/i );
+    $os_ver = "$1" if ( $descr =~ /Product Version ([0-9.]+)/i );
 
     return $ver_release->{2} || $os_ver;
 }