diff --git a/Netdisco/META.yml b/Netdisco/META.yml
index baada813..cef58c6d 100644
--- a/Netdisco/META.yml
+++ b/Netdisco/META.yml
@@ -71,4 +71,4 @@ resources:
   homepage: http://netdisco.org/
   license: http://opensource.org/licenses/bsd-license.php
   repository: git://git.code.sf.net/p/netdisco/netdisco-ng
-version: 2.021000_002
+version: 2.021000_003
diff --git a/Netdisco/lib/App/Netdisco.pm b/Netdisco/lib/App/Netdisco.pm
index 50ce7a28..49d5801f 100644
--- a/Netdisco/lib/App/Netdisco.pm
+++ b/Netdisco/lib/App/Netdisco.pm
@@ -7,7 +7,7 @@ use 5.010_000;
 use File::ShareDir 'dist_dir';
 use Path::Class;
 
-our $VERSION = '2.021000_002';
+our $VERSION = '2.021000_003';
 
 BEGIN {
   if (not ($ENV{DANCER_APPDIR} || '')
diff --git a/Netdisco/lib/App/Netdisco/Core/Discover.pm b/Netdisco/lib/App/Netdisco/Core/Discover.pm
index a546aa39..8ac82e6c 100644
--- a/Netdisco/lib/App/Netdisco/Core/Discover.pm
+++ b/Netdisco/lib/App/Netdisco/Core/Discover.pm
@@ -733,7 +733,7 @@ sub store_neighbors {
               foreach my $n (@$remote_ip) {
                   debug sprintf
                     ' [%s] neigh - adding neighbor %s, type [%s], on %s to discovery queue',
-                    $device->ip, $n, $remote_type, $port;
+                    $device->ip, $n, ($remote_type || ''), $port;
                   push @to_discover, [$n, $remote_type];
               }
           }
@@ -747,7 +747,7 @@ sub store_neighbors {
           if (wantarray) {
               debug sprintf
                 ' [%s] neigh - adding neighbor %s, type [%s], on %s to discovery queue',
-                $device->ip, $remote_ip, $remote_type, $port;
+                $device->ip, $remote_ip, ($remote_type || ''), $port;
               push @to_discover, [$remote_ip, $remote_type];
           }
 
@@ -894,7 +894,7 @@ sub discover_new_neighbors {
       if (not is_discoverable($device, $remote_type)) {
           debug sprintf
             ' queue - %s, type [%s] excluded by discover_* config',
-            $ip, $remote_type;
+            $ip, ($remote_type || '');
           next;
       }
 
diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt
index 109f416a..64e41860 100644
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -243,9 +243,9 @@
                   self_options) %]&q=[% row.neighbor.dns || row.neighbor.ip | uri %]&f=[% row.remote_port | uri %]">
             [% row.neighbor.dns.remove(settings.domain_suffix) || row.neighbor.ip | html_entity %]
             [% ' - ' IF row.remote_port %][% row.remote_port | html_entity %]</a><br/>
-            [% IF params.neigh_id %]
+            [% IF params.neigh_id and (row.remote_id or row.remote_type) %]
               ([% 'id: '_ row.remote_id IF row.remote_id %]
-              [% ' type: '_ row.remote_type IF row.remote_type %])
+              [% ' type: '_ row.remote_type IF row.remote_type %])<br/>
             [% END %]
           [% ELSIF row.remote_ip %]
             <i class="icon-unlink text-error"></i>&nbsp;
@@ -257,9 +257,9 @@
             <a href="[% search_node %]&q=[% row.remote_ip | uri %]">
               [% row.remote_ip | html_entity %]
               [% ' - ' IF row.remote_port %][% row.remote_port | html_entity %]</a><br/>
-            [% IF params.neigh_id %]
+            [% IF params.neigh_id and (row.remote_id or row.remote_type) %]
               ([% 'id: '_ row.remote_id IF row.remote_id %]
-              [% ' type: '_ row.remote_type IF row.remote_type %])
+              [% ' type: '_ row.remote_type IF row.remote_type %])<br/>
             [% END %]
           [% ELSE %]
             <i class="icon-unlink text-error"></i>&nbsp; (possible uplink)