diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 56fc154ce8..1b57d558f9 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -5910,13 +5910,28 @@ class upgradeModel extends model
         if(empty($moduleBranchPairs)) return true;
 
         $storyModulePairs = $this->dao->select('module')->from(TABLE_STORY)->where('module')->in(array_keys($moduleBranchPairs))->andWhere('branch')->eq(0)->fetchPairs();
-        foreach($storyModulePairs as $moduleID) $this->dao->update(TABLE_STORY)->set('`branch`')->eq($moduleBranchPairs[$moduleID])->where('module')->eq($moduleID)->exec();
+        foreach($storyModulePairs as $moduleID)
+        {
+            if(!isset($moduleBranchPairs[$moduleID])) continue;
+
+            $this->dao->update(TABLE_STORY)->set('`branch`')->eq($moduleBranchPairs[$moduleID])->where('module')->eq($moduleID)->exec();
+        }
 
         $bugModulePairs = $this->dao->select('module')->from(TABLE_BUG)->where('module')->in(array_keys($moduleBranchPairs))->andWhere('branch')->eq(0)->fetchPairs();
-        foreach($bugModulePairs as $moduleID) $this->dao->update(TABLE_BUG)->set('`branch`')->eq($moduleBranchPairs[$moduleID])->where('module')->eq($moduleID)->exec();
+        foreach($bugModulePairs as $moduleID)
+        {
+            if(!isset($moduleBranchPairs[$moduleID])) continue;
+
+            $this->dao->update(TABLE_BUG)->set('`branch`')->eq($moduleBranchPairs[$moduleID])->where('module')->eq($moduleID)->exec();
+        }
 
         $caseModulePairs = $this->dao->select('module')->from(TABLE_CASE)->where('module')->in(array_keys($moduleBranchPairs))->andWhere('branch')->eq(0)->fetchPairs();
-        foreach($caseModulePairs as $moduleID) $this->dao->update(TABLE_CASE)->set('`branch`')->eq($moduleBranchPairs[$moduleID])->where('module')->eq($moduleID)->exec();
+        foreach($caseModulePairs as $moduleID)
+        {
+            if(!isset($moduleBranchPairs[$moduleID])) continue;
+
+            $this->dao->update(TABLE_CASE)->set('`branch`')->eq($moduleBranchPairs[$moduleID])->where('module')->eq($moduleID)->exec();
+        }
 
         return true;
     }