diff --git a/Netdisco/Changes b/Netdisco/Changes
index ff9d7ea5..312b7035 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,3 +1,9 @@
+2.032007 - 2015-0
+
+  [BUG FIXES]
+
+  * Skip VLANs undef or zero (reported by Brian van Baekel)
+
 2.032006 - 2015-07-18
 
   [BUG FIXES]
diff --git a/Netdisco/lib/App/Netdisco/Core/Discover.pm b/Netdisco/lib/App/Netdisco/Core/Discover.pm
index 43625295..2e298344 100644
--- a/Netdisco/lib/App/Netdisco/Core/Discover.pm
+++ b/Netdisco/lib/App/Netdisco/Core/Discover.pm
@@ -416,6 +416,7 @@ sub store_vlans {
   my @devicevlans;
   foreach my $entry (keys %$v_name) {
       my $vlan = $v_index->{$entry};
+      next unless defined $vlan and $vlan;
       ++$v_seen{$vlan};
 
       push @devicevlans, {
@@ -440,6 +441,7 @@ sub store_vlans {
       my $type = $i_vlan_type->{$entry};
 
       foreach my $vlan (@{ $i_vlan_membership->{$entry} }) {
+          next unless defined $vlan and $vlan;
           next if ++$port_vseen{$vlan} > 1;
 
           my $native = ((defined $i_vlan->{$entry}) and ($vlan eq $i_vlan->{$entry})) ? "t" : "f";