Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...

diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm
index 13c8d9c..3b7c3aa 100644 (file)
--- 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};
+
   }
 
 }