diff --git a/Code/Legacy/CryCommon/ICmdLine.h b/Code/Legacy/CryCommon/ICmdLine.h
index 6071671b02..80561fd85c 100644
--- a/Code/Legacy/CryCommon/ICmdLine.h
+++ b/Code/Legacy/CryCommon/ICmdLine.h
@@ -71,6 +71,14 @@ public:
     //      The value of the argument as integer number.
     virtual const int GetIValue() const = 0;
     // </interfuscator:shuffle>
+
+    // Description:
+    //      Retrieve the value of the argument.
+    // Arguments:
+    //      cmdLineValue. The cmdline value will be filled out if a valid boolean is found.
+    // Return Value:
+    //      Returns true if the cmdline arg is actually a boolean string matching "true" or "false"; otherwise return false.
+    virtual const bool GetBoolValue(bool& cmdLineValue) const = 0;
 };
 
 // Command line interface
diff --git a/Code/Legacy/CrySystem/CmdLineArg.cpp b/Code/Legacy/CrySystem/CmdLineArg.cpp
index 79d23ddae7..554e734055 100644
--- a/Code/Legacy/CrySystem/CmdLineArg.cpp
+++ b/Code/Legacy/CrySystem/CmdLineArg.cpp
@@ -42,5 +42,22 @@ const int CCmdLineArg::GetIValue() const
 {
     return atoi(m_value.c_str());
 }
+const bool CCmdLineArg::GetBoolValue(bool& cmdLineValue) const
+{
+    AZStd::string lowercaseValue(m_value);
+    AZStd::to_lower(lowercaseValue.begin(), lowercaseValue.end());
+    if (lowercaseValue == "true")
+    {
+        cmdLineValue = true;
+        return true;
+    }
 
+    if (lowercaseValue == "false")
+    {
+        cmdLineValue = false;
+        return true;
+    }
+    
+    return false;
+}
 
diff --git a/Code/Legacy/CrySystem/CmdLineArg.h b/Code/Legacy/CrySystem/CmdLineArg.h
index 5e3a629e7c..66d56be132 100644
--- a/Code/Legacy/CrySystem/CmdLineArg.h
+++ b/Code/Legacy/CrySystem/CmdLineArg.h
@@ -30,6 +30,7 @@ public:
     const ECmdLineArgType GetType() const;
     const float GetFValue() const;
     const int GetIValue() const;
+    const bool GetBoolValue(bool& cmdLineValue) const;
 
 private:
 
diff --git a/Code/Legacy/CrySystem/SystemInit.cpp b/Code/Legacy/CrySystem/SystemInit.cpp
index 0bd57c254b..477425a04d 100644
--- a/Code/Legacy/CrySystem/SystemInit.cpp
+++ b/Code/Legacy/CrySystem/SystemInit.cpp
@@ -741,9 +741,8 @@ bool CSystem::Init(const SSystemInitParams& startupParams)
     bool suppressSystemOutput = true;
     if (const ICmdLineArg* isEditorServerArg = m_pCmdLine->FindArg(eCLAT_Pre, "editorsv_isDedicated"))
     {
-        AZ::CVarFixedString lowercaseValue(isEditorServerArg->GetValue());
-        AZStd::to_lower(lowercaseValue.begin(), lowercaseValue.end());
-        if (lowercaseValue == "true")
+        bool editorsv_isDedicated = false;
+        if (isEditorServerArg->GetBoolValue(editorsv_isDedicated) && editorsv_isDedicated)
         {
             suppressSystemOutput = false;
         }
diff --git a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp
index 973ee443f0..ec783808a2 100644
--- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp
@@ -6,7 +6,6 @@
  *
  */
 
-
 #include <Multiplayer/IMultiplayer.h>
 #include <Multiplayer/IMultiplayerTools.h>
 #include <Multiplayer/INetworkSpawnableLibrary.h>
@@ -421,7 +420,17 @@ namespace Multiplayer
 
     void MultiplayerEditorSystemComponent::OnTick(float, AZ::ScriptTimePoint)
     {
-        m_serverProcessTracePrinter->Pump();
+        if (m_serverProcessTracePrinter)
+        {
+            m_serverProcessTracePrinter->Pump();
+        }
+        else
+        {
+            AZ::TickBus::Handler::BusDisconnect();
+            AZ_Warning(
+                "MultiplayerEditorSystemComponent", false,
+                "The server process trace printer is NULL so we won't be able to pipe server logs to the editor. Please update the code to call AZ::TickBus::Handler::BusDisconnect whenever the editor-server is terminated.")
+        }
     }
 
 }