diff --git a/Info/Layer2/HP.pm b/Info/Layer2/HP.pm
index 6873455c..1104eb8d 100644
--- a/Info/Layer2/HP.pm
+++ b/Info/Layer2/HP.pm
@@ -157,7 +157,9 @@ sub os_ver {
 sub model {
     my $hp = shift;
     my $id = $hp->id();
+    return undef unless defined $id;
     my $model = &SNMP::translateObj($id);
+    return $id unless defined $model;
     
     $model =~ s/^hpswitch//i;