From a6c5bd2d56ad177a8f79ac0aa5c88b389513dc82 Mon Sep 17 00:00:00 2001
From: Jonathan Prykop <jonathan@freeside.biz>
Date: Mon, 30 Jan 2017 16:31:46 -0600
Subject: [PATCH] 74355: freeside-upgrade error N/A (tokenized) [better error
 handling for encryption upgrade failures]

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 9a300cdc9..90256bd81 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -5426,7 +5426,7 @@ sub queueable_upgrade {
         local($import) = 1;#prevent automatic geocoding (need its own variable?)
 
         my $error = $record->replace;
-        die $error if $error;
+        die "Error replacing $table ".$record->get($record->primary_key).": $error" if $error;
       }
     }
 
-- 
2.11.0