diff --git a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilder.cpp b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilder.cpp
index 1771d9b4a6..6a5344ed9b 100644
--- a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilder.cpp
+++ b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilder.cpp
@@ -137,16 +137,9 @@ namespace ScriptCanvasBuilder
 
             if (!ScriptCanvas::Grammar::IsParserGeneratedId(entityId.first))
             {
-                auto graphEntityId = variables.FindVariable(entityId.first);
-                if (!graphEntityId)
-                {
-                    AZ_Error("ScriptCanvasBuilder", false, "Missing EntityId from graph data that was just parsed");
-                    continue;
-                }
-
-                // copy to override list for editor display
-                if (graphEntityId->IsComponentProperty())
+                if (auto graphEntityId = variables.FindVariable(entityId.first); graphEntityId && graphEntityId->IsComponentProperty())
                 {
+                    // copy to override list for editor display
                     m_overrides.push_back(*graphEntityId);
                     auto& overrideValue = m_overrides.back();
                     overrideValue.SetScriptInputControlVisibility(AZ::Edit::PropertyVisibility::Hide);