From 57274014205c53716c2bf0c4fb3e9ffe257e4654 Mon Sep 17 00:00:00 2001
From: Mitch Jackson <mitch@freeside.biz>
Date: Tue, 27 Nov 2018 18:28:30 -0500
Subject: [PATCH] RT# 38217 Fix msg_template freeside-upgrade bug

---
 FS/FS/msg_template.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm
index 13c8d9c49..3b7c3aa84 100644
--- a/FS/FS/msg_template.pm
+++ b/FS/FS/msg_template.pm
@@ -929,8 +929,9 @@ sub _populate_initial_data { #class method
     die $error if $error;
 
     $conf->set( $hash->{_conf}, $msg_template->msgnum ) if $hash->{_conf};
-    FS::upgrade_journal->set_done( $hash->{_upgrade_journal} );
-  
+    FS::upgrade_journal->set_done( $hash->{_upgrade_journal} )
+      if $hash->{_upgrade_journal};
+
   }
 
 }
-- 
2.11.0