diff --git a/Code/Legacy/CrySystem/ViewSystem/ViewSystem.cpp b/Code/Legacy/CrySystem/ViewSystem/ViewSystem.cpp
index e83676827f..d7e5c081c0 100644
--- a/Code/Legacy/CrySystem/ViewSystem/ViewSystem.cpp
+++ b/Code/Legacy/CrySystem/ViewSystem/ViewSystem.cpp
@@ -115,17 +115,20 @@ CViewSystem::CViewSystem(ISystem* pSystem)
     , m_useDeferredViewSystemUpdate(false)
     , m_bControlsAudioListeners(true)
 {
-#if !defined(_RELEASE) && !defined(DEDICATED_SERVER)
-    if (!s_debugCamera)
+#if !defined(_RELEASE)
+    if (!gEnv->IsDedicated())
     {
-        s_debugCamera = new DebugCamera;
-    }
+        if (!s_debugCamera)
+        {
+            s_debugCamera = new DebugCamera;
+        }
 
-    REGISTER_COMMAND("debugCameraToggle", ToggleDebugCamera, VF_DEV_ONLY, "Toggle the debug camera.\n");
-    REGISTER_COMMAND("debugCameraInvertY", ToggleDebugCameraInvertY, VF_DEV_ONLY, "Toggle debug camera Y-axis inversion.\n");
-    REGISTER_COMMAND("debugCameraMove", DebugCameraMove, VF_DEV_ONLY, "Move the debug camera the specified distance (x y z).\n");
-    gEnv->pConsole->CreateKeyBind("ctrl_keyboard_key_punctuation_backslash", "debugCameraToggle");
-    gEnv->pConsole->CreateKeyBind("alt_keyboard_key_punctuation_backslash", "debugCameraInvertY");
+        REGISTER_COMMAND("debugCameraToggle", ToggleDebugCamera, VF_DEV_ONLY, "Toggle the debug camera.\n");
+        REGISTER_COMMAND("debugCameraInvertY", ToggleDebugCameraInvertY, VF_DEV_ONLY, "Toggle debug camera Y-axis inversion.\n");
+        REGISTER_COMMAND("debugCameraMove", DebugCameraMove, VF_DEV_ONLY, "Move the debug camera the specified distance (x y z).\n");
+        gEnv->pConsole->CreateKeyBind("ctrl_keyboard_key_punctuation_backslash", "debugCameraToggle");
+        gEnv->pConsole->CreateKeyBind("alt_keyboard_key_punctuation_backslash", "debugCameraInvertY");
+    }
 #endif
 
     REGISTER_CVAR2("cl_camera_noise", &m_fCameraNoise, -1, 0,
@@ -167,6 +170,21 @@ CViewSystem::~CViewSystem()
     {
         m_pSystem->GetILevelSystem()->RemoveListener(this);
     }
+
+#if !defined(_RELEASE)
+    if (!gEnv->IsDedicated())
+    {
+        UNREGISTER_COMMAND("debugCameraToggle");
+        UNREGISTER_COMMAND("debugCameraInvertY");
+        UNREGISTER_COMMAND("debugCameraMove");
+
+        if (s_debugCamera)
+        {
+            delete s_debugCamera;
+            s_debugCamera = nullptr;
+        }
+    }
+#endif
 }
 
 //------------------------------------------------------------------------
diff --git a/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.cpp b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.cpp
index 7d659ebb7a..91844c9b2f 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.cpp
@@ -130,7 +130,8 @@ namespace AZ::Render
         }
         AZ::RPI::ViewportContextPtr viewportContext = GetViewportContext();
 
-        if (!m_fontDrawInterface || !viewportContext || !viewportContext->GetRenderScene())
+        if (!m_fontDrawInterface || !viewportContext || !viewportContext->GetRenderScene() ||
+            !AZ::Interface<AzFramework::FontQueryInterface>::Get())
         {
             return;
         }