diff --git a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasFileHandling.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasFileHandling.cpp
index ec225017fe..68648a71f3 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasFileHandling.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasFileHandling.cpp
@@ -175,7 +175,7 @@ namespace ScriptCanvasEditor
         auto saveTarget = graphData->ModGraph();
         if (!saveTarget || !saveTarget->GetGraphData())
         {
-            return AZ::Failure(AZStd::string("source save container failed to return graph data"));
+            return AZ::Failure(AZStd::string("source save container failed to return serializable graph data"));
         }
 
         AZ::JsonSerializerSettings settings;
@@ -194,12 +194,8 @@ namespace ScriptCanvasEditor
         auto saveOutcome = JSRU::SaveObjectToStream<ScriptCanvas::ScriptCanvasData>(graphData, stream, nullptr, &settings);
         if (!saveOutcome.IsSuccess())
         {
-
-            Here is the allocation failure.
-
-                AZStd::string result = saveOutcome.TakeError();
-
-            return AZ::Failure(AZStd::string("JSON serialization failed to save source: %s", saveOutcome.GetError().c_str()));
+            AZStd::string result = saveOutcome.TakeError();
+            return AZ::Failure(AZStd::string("JSON serialization failed to save source: %s", result.c_str()));
         }
 
         return AZ::Success();
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
index 6203423e29..a53100eea8 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
@@ -1409,7 +1409,7 @@ namespace ScriptCanvasEditor
         AZ::Outcome<ScriptCanvasEditor::SourceHandle, AZStd::string> outcome = LoadFromFile(fullPath);
         if (!outcome.IsSuccess())
         {
-            QMessageBox::warning(this, "Invalid Source File", QString("'%1' is not a valid file path.").arg(fullPath), QMessageBox::Ok);
+            QMessageBox::warning(this, "Invalid Source File", QString("'%1' failed to load properly.").arg(fullPath), QMessageBox::Ok);
             m_errorFilePath = fullPath;
             AZ_Warning("ScriptCanvas", false, "Unable to open file as a ScriptCanvas graph: %s", fullPath);
             return;
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.cpp
index 035152a521..888f183151 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.cpp
@@ -165,7 +165,7 @@ namespace ScriptCanvasEditor
             {
                 int result = QMessageBox::No;
                 QMessageBox mb
-                (QMessageBox::Warning
+                    ( QMessageBox::Warning
                     , QObject::tr("Failed to Save Upgraded File")
                     , QObject::tr("The upgraded file could not be saved because the file is read only.\n"
                         "Do you want to make it writeable and overwrite it?")
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.cpp
index a88c6c2c7e..c23a3d915b 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.cpp
@@ -221,10 +221,16 @@ namespace ScriptCanvasEditor
             {
                 auto streamer = AZ::Interface<AZ::IO::IStreamer>::Get();
                 AZ::IO::FileRequestPtr flushRequest = streamer->FlushCache(source.Path().c_str());
-                streamer->SetRequestCompleteCallback(flushRequest, [this, source]([[maybe_unused]] AZ::IO::FileRequestHandle request)
+                streamer->SetRequestCompleteCallback(flushRequest, [this]([[maybe_unused]] AZ::IO::FileRequestHandle request)
                 {
-                    this->OnSourceFileReleased(source);
+                    AZStd::lock_guard<AZStd::mutex> lock(m_mutex);
+                    if (!m_sourceFileReleased)
+                    {
+                        m_sourceFileReleased = true;
+                        AZ::SystemTickBus::QueueFunction([this]() { this->OnSourceFileReleased(m_source); });
+                    }
                 });
+
                 streamer->QueueRequest(flushRequest);
             }
         }
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.h b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.h
index d04b543b0c..e87ee060f7 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.h
@@ -33,6 +33,9 @@ namespace ScriptCanvasEditor
             void Save(const SourceHandle& source);
 
         private:
+            AZStd::mutex m_mutex;
+
+            bool m_sourceFileReleased = false;
             SourceHandle m_source;
             AZStd::function<void(const FileSaveResult& result)> m_onComplete;
             AZStd::function<bool()> m_onReadOnlyFile;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.cpp
index 7bfa9fabd2..de96c9953b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.cpp
@@ -205,9 +205,9 @@ namespace ScriptCanvasEditor
 
     bool SourceHandle::AnyEquals(const SourceHandle& other) const
     {
-        return m_data == other.m_data
-            || m_id == other.m_id
-            || m_path == other.m_path;
+        return m_data && m_data == other.m_data
+            || !m_id.IsNull() && m_id == other.m_id
+            || !m_path.empty() &&  m_path == other.m_path;
     }
 
     void SourceHandle::Clear()