diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
index 1b8105ebd..7ae71868b 100644
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@@ -116,12 +116,20 @@ class MenuAdminController extends Menu
 			$unlinked_modules = $output->data;
 		}
 
-		if($unlinked_modules)
+		if ($unlinked_modules)
 		{
 			$unlinked_menu_srl = $this->getUnlinkedMenu();
-			$output = $this->updateLinkModule($unlinked_modules, $unlinked_menu_srl);
+			if ($unlinked_menu_srl instanceof BaseObject && !$unlinked_menu_srl->toBool())
+			{
+				return $unlinked_menu_srl;
+			}
+			else
+			{
+				return $this->updateLinkModule($unlinked_modules, $unlinked_menu_srl);
+			}
 		}
 
+		return new BaseObject();
 	}
 
 	function getUnlinkedMenu()
@@ -152,7 +160,7 @@ class MenuAdminController extends Menu
 			}
 			else
 			{
-				return false;
+				return $output;
 			}
 		}
 
diff --git a/modules/menu/menu.admin.view.php b/modules/menu/menu.admin.view.php
index a6869579e..0587d1411 100644
--- a/modules/menu/menu.admin.view.php
+++ b/modules/menu/menu.admin.view.php
@@ -38,7 +38,11 @@ class MenuAdminView extends Menu
 		if($site_srl == 0)
 		{
 			$oMenuController = getAdminController('menu');
-			$oMenuController->linkAllModuleInstancesToSitemap();
+			$output = $oMenuController->linkAllModuleInstancesToSitemap();
+			if (!$output->toBool())
+			{
+				return $output;
+			}
 		}
 
 		// get installed module list