diff --git a/src/SystemManager.cc b/src/SystemManager.cc
index e582bf5e0f9..524286e97b1 100644
--- a/src/SystemManager.cc
+++ b/src/SystemManager.cc
@@ -220,6 +220,13 @@ void SystemManager::ProcessPendingEntitySystems()
   {
     Entity entity = req.entity().id();
 
+    if (req.plugins().empty())
+    {
+      ignerr << "Unable to add plugins to Entity: '" << entity
+             << "'. No plugins specified." << std::endl;
+       continue;
+    }
+
     for (auto &pluginMsg : req.plugins())
     {
       std::string fname = pluginMsg.filename();
@@ -231,5 +238,3 @@ void SystemManager::ProcessPendingEntitySystems()
   }
   this->systemsToAdd.clear();
 }
-
-
diff --git a/test/integration/entity_system.cc b/test/integration/entity_system.cc
index 47b89c76377..396f5496bc3 100644
--- a/test/integration/entity_system.cc
+++ b/test/integration/entity_system.cc
@@ -149,7 +149,7 @@ class EntitySystemTest : public InternalFixture<::testing::TestWithParam<int>>
 };
 
 /////////////////////////////////////////////////
-// See https://github.com/ignitionrobotics/ign-gazebo/issues/1175
+// See https://github.com/gazebosim/gz-sim/issues/1175
 TEST_P(EntitySystemTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(PublishCmd))
 {
   TestPublishCmd(