diff --git a/Netdisco/lib/App/Netdisco/Core/Discover.pm b/Netdisco/lib/App/Netdisco/Core/Discover.pm
index c70b26bc..ee8002e5 100644
--- a/Netdisco/lib/App/Netdisco/Core/Discover.pm
+++ b/Netdisco/lib/App/Netdisco/Core/Discover.pm
@@ -82,7 +82,8 @@ sub set_canonical_ip {
   }
 
   schema('netdisco')->txn_do(sub {
-    $device->renumber($new_ip) or die; # rollback
+    $device->renumber($new_ip)
+      or die "cannot renumber to: $new_ip"; # rollback
 
     my $hostname = hostname_from_ip($device->ip);
     $device->update({dns => $hostname});
diff --git a/Netdisco/lib/App/Netdisco/Util/Device.pm b/Netdisco/lib/App/Netdisco/Util/Device.pm
index 3b06c920..74012e1f 100644
--- a/Netdisco/lib/App/Netdisco/Util/Device.pm
+++ b/Netdisco/lib/App/Netdisco/Util/Device.pm
@@ -117,7 +117,8 @@ sub renumber_device {
 
   my $happy = 0;
   schema('netdisco')->txn_do(sub {
-    $device->renumber($new_ip) or die; # rollback
+    $device->renumber($new_ip)
+      or die "cannot renumber to: $new_ip"; # rollback
 
     schema('netdisco')->resultset('UserLog')->create({
       username => session('logged_in_user'),