diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm b/lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm
index cee883db..393a30e6 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm
@@ -45,9 +45,10 @@ register_worker({ phase => 'early', driver => 'snmp' }, sub {
       $device->set_column( $property => $snmp->$property );
   }
 
-  (my $model = Encode::decode('UTF-8', ($snmp->model || ''))) =~ s/\s+$//;
-  $device->set_column( model => $model  );
-  $device->set_column( serial => Encode::decode('UTF-8', $snmp->serial) );
+  (my $model  = Encode::decode('UTF-8', ($snmp->model  || ''))) =~ s/\s+$//;
+  (my $serial = Encode::decode('UTF-8', ($snmp->serial || ''))) =~ s/\s+$//;
+  $device->set_column( model  => $model  );
+  $device->set_column( serial => $serial );
   $device->set_column( contact => Encode::decode('UTF-8', $snmp->contact) );
   $device->set_column( location => Encode::decode('UTF-8', $snmp->location) );