From 3505abe435b43fe663301e64295f8f9fe4cc816c Mon Sep 17 00:00:00 2001
From: Andre Mitchell <andre.mitchell@bytesofpi.com>
Date: Tue, 2 Nov 2021 11:17:55 -0400
Subject: [PATCH] Prevent GetNodesFromGraphNodeIDs() from adding null pointers
 to the list that it returns.

Signed-off-by: Andre Mitchell <andre.mitchell@bytesofpi.com>
---
 Gems/GraphModel/Code/Source/Integration/GraphController.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Gems/GraphModel/Code/Source/Integration/GraphController.cpp b/Gems/GraphModel/Code/Source/Integration/GraphController.cpp
index 86cfb42990..c20d093e4b 100644
--- a/Gems/GraphModel/Code/Source/Integration/GraphController.cpp
+++ b/Gems/GraphModel/Code/Source/Integration/GraphController.cpp
@@ -698,7 +698,10 @@ namespace GraphModelIntegration
         GraphModel::NodePtrList nodeList;
         for (auto nodeId : nodeIds)
         {
-            nodeList.push_back(m_elementMap.Find<GraphModel::Node>(nodeId));
+            if (GraphModel::NodePtr nodePtr = m_elementMap.Find<GraphModel::Node>(nodeId))
+            {
+                nodeList.push_back(nodePtr);
+            }
         }
 
         return nodeList;