diff --git a/Changes b/Changes
index 2cc48d01..18f10b54 100644
--- a/Changes
+++ b/Changes
@@ -2,13 +2,17 @@
 
   [NEW FEATURES]
 
-  * Node Montior is now included in Admin menu
   * #48 Node Monitor supports matching on OUI
-  * #31 Configurable Free Time in Port Utilization Report
+  * #31 configurable Free Time in Port Utilization Report
 
   [ENHANCEMENTS]
 
-  * #24 Show device age in device search view
+  * #24 show device age in device search view
+  * Node Montior is now included in Admin menu
+
+  [BUG FIXES]
+
+  * #274 errors in IP Inventory report
 
 2.039015 - 2018-03-05
 
diff --git a/lib/App/Netdisco/DB/Result/Virtual/CidrIps.pm b/lib/App/Netdisco/DB/Result/Virtual/CidrIps.pm
index a5e9fdc8..c69d9b75 100644
--- a/lib/App/Netdisco/DB/Result/Virtual/CidrIps.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/CidrIps.pm
@@ -12,7 +12,7 @@ __PACKAGE__->table('cidr_ips');
 __PACKAGE__->result_source_instance->is_virtual(1);
 __PACKAGE__->result_source_instance->view_definition(<<'ENDSQL');
 SELECT host(network (prefix) + sub.int)::inet AS ip,
-       NULL AS mac,
+       NULL::macaddr AS mac,
        NULL::text AS dns,
        NULL::timestamp AS time_first,
        NULL::timestamp AS time_last,
diff --git a/lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm b/lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm
index 77469b97..315db783 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm
@@ -19,7 +19,7 @@ get '/ajax/content/report/ipinventory' => require_login sub {
 
     # Default to something simple with no results to prevent
     # "Search failed!" error
-    my $subnet = param('subnet') || '0.0.0.0/32';
+    (my $subnet = (param('subnet') || '0.0.0.0/32')) =~ s/\s//g;
     $subnet = NetAddr::IP::Lite->new($subnet);
     $subnet = NetAddr::IP::Lite->new('0.0.0.0/32')
       if (! $subnet) or ($subnet->addr eq '0.0.0.0');
@@ -41,7 +41,7 @@ get '/ajax/content/report/ipinventory' => require_login sub {
         {   join   => 'device',
             select => [
                 'alias AS ip',
-                \'NULL as mac',
+                \'NULL::macaddr as mac',
                 'creation AS time_first',
                 'device.last_discover AS time_last',
                 'dns',