diff --git a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/FoodDeliveryController.cpp b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/FoodDeliveryController.cpp
index 723de3d..a7dba74 100644
--- a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/FoodDeliveryController.cpp
+++ b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/FoodDeliveryController.cpp
@@ -377,7 +377,7 @@ void FoodDeliveryController::listMenuItems() const
 					<< "\n";
 			}
 		}
-		else
+		else if (!restaurantOwner.getRestaurants().empty())
 		{
 			std::cout << "Invalid Index. Cannot display Menu Items!\n";
 			return;
@@ -415,7 +415,7 @@ void FoodDeliveryController::addMenuItem() const
 			restaurantIterator->second->addMenuItem(menuItem);
 			std::cout << "Added new Menu Item " << menuItem.getName() << " with ID " << menuItem.getId() << " to Restaurant " << restaurantIterator->second->getName() << " successfully\n";
 		}
-		else
+		else if (!restaurantOwner.getRestaurants().empty())
 		{
 			std::cout << "Invalid Index. Cannot add new Menu Item!\n";
 			return;