diff --git a/Netdisco/lib/App/Netdisco/Core/Discover.pm b/Netdisco/lib/App/Netdisco/Core/Discover.pm
index 11c674da..c70b26bc 100644
--- a/Netdisco/lib/App/Netdisco/Core/Discover.pm
+++ b/Netdisco/lib/App/Netdisco/Core/Discover.pm
@@ -82,7 +82,7 @@ sub set_canonical_ip {
   }
 
   schema('netdisco')->txn_do(sub {
-    $device->renumber($new_ip) or return;
+    $device->renumber($new_ip) or die; # 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 99038c4d..3b06c920 100644
--- a/Netdisco/lib/App/Netdisco/Util/Device.pm
+++ b/Netdisco/lib/App/Netdisco/Util/Device.pm
@@ -83,6 +83,10 @@ sub delete_device {
 
   my $happy = 0;
   schema('netdisco')->txn_do(sub {
+    # will delete everything related too...
+    schema('netdisco')->resultset('Device')
+      ->search({ ip => $device->ip })->delete({archive_nodes => $archive});
+
     schema('netdisco')->resultset('UserLog')->create({
       username => session('logged_in_user'),
       userip => scalar eval {request->remote_address},
@@ -90,9 +94,6 @@ sub delete_device {
       details => $log,
     });
 
-    # will delete everything related too...
-    schema('netdisco')->resultset('Device')
-      ->search({ ip => $device->ip })->delete({archive_nodes => $archive});
     $happy = 1;
   });
 
@@ -116,7 +117,7 @@ sub renumber_device {
 
   my $happy = 0;
   schema('netdisco')->txn_do(sub {
-    $device->renumber($new_ip) or return;
+    $device->renumber($new_ip) or die; # rollback
 
     schema('netdisco')->resultset('UserLog')->create({
       username => session('logged_in_user'),