From d2c37c8081873993f108f46361a804abc8aa23d9 Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Fri, 31 Jul 2015 13:46:44 -0700
Subject: [PATCH] fix otaker method on history tables, probably from #13971

---
 FS/FS/otaker_Mixin.pm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/FS/FS/otaker_Mixin.pm b/FS/FS/otaker_Mixin.pm
index 6e465f06a..186c7d1ba 100644
--- a/FS/FS/otaker_Mixin.pm
+++ b/FS/FS/otaker_Mixin.pm
@@ -24,7 +24,15 @@ sub otaker {
     $otaker; #not sure return is used anywhere, but just in case
   } else { #get
     if ( $self->usernum ) {
-      $self->access_user->username;
+      # avoid a common failure mode: this should work even when the table 
+      # isn't foreign-keyed to access_user
+      my $access_user = FS::access_user->by_key($self->usernum);
+      if (!$access_user) {
+        croak "otaker called on ".$self->table."#".
+              $self->get($self->primary_key).
+              " but user does not exist";
+      }
+      return $access_user->username;
     } elsif ( length($self->get('otaker')) ) {
       $self->get('otaker');
     } else {
-- 
2.11.0