merge from latest

Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>

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);

Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp

@@ -4343,6 +4343,9 @@ namespace ScriptCanvas
 
                     execution->AddInput({ &input, inputVariable, DebugDataSource::FromSelfSlot(input, inputVariable->m_datum.GetType()) });
                 }
+
+                // Check for known null reads
+                CheckForKnownNullDereference(execution, execution->GetInput(execution->GetInputCount() - 1), input);
             }
             else
             {
@@ -4374,9 +4377,6 @@ namespace ScriptCanvas
                     return;
                 }
             }
-
-            // Check for known null reads
-            CheckForKnownNullDereference(execution, execution->GetInput(execution->GetInputCount() - 1), input);
         }
 
         bool AbstractCodeModel::ParseInputThisPointer(ExecutionTreePtr execution)

Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp

@@ -1943,7 +1943,8 @@ namespace ScriptCanvas
                 {
                     const auto requirement = ParseConstructionRequirement(variable);
 
-                    if (requirement == Grammar::VariableConstructionRequirement::None || (requirement != Grammar::VariableConstructionRequirement::Static && !execution->IsStartCall()))
+                    if (requirement == Grammar::VariableConstructionRequirement::None
+                    || requirement != Grammar::VariableConstructionRequirement::Static && execution != m_model.GetStart())
                     {
                         m_dotLua.WriteLineIndented("local %s = %s", variable->m_name.data(), ToValueString(variable->m_datum, m_configuration).data());
                     }