diff --git a/Assets/Editor/Fonts/MaterialIcons-Regular.shfont b/Assets/Editor/Fonts/MaterialIcons-Regular.shfont
deleted file mode 100644
index 496a7032..00000000
Binary files a/Assets/Editor/Fonts/MaterialIcons-Regular.shfont and /dev/null differ
diff --git a/Assets/Editor/Fonts/fa-solid-900.shfont b/Assets/Editor/Fonts/fa-solid-900.shfont
deleted file mode 100644
index 71c2c4ac..00000000
Binary files a/Assets/Editor/Fonts/fa-solid-900.shfont and /dev/null differ
diff --git a/Assets/Editor/Fonts/Segoe UI.shfont b/Assets/Fonts/SegoeUI.shfont
similarity index 100%
rename from Assets/Editor/Fonts/Segoe UI.shfont
rename to Assets/Fonts/SegoeUI.shfont
diff --git a/Assets/Shaders/Text_VS.glsl b/Assets/Shaders/Text_VS.glsl
index 90760fe2..b3224211 100644
--- a/Assets/Shaders/Text_VS.glsl
+++ b/Assets/Shaders/Text_VS.glsl
@@ -55,7 +55,7 @@ vec2 CreateQuad(in uint vertexID)
 void main()
 {
   // write EID data to FS
-  Out2.eid = testPushConstats.eid;
+  Out2.eid = testPushConstant.eid;
 
   // local variable for font index
   uint fontIndex = glyphIndex;
diff --git a/Assets/Shaders/Text_VS.shshaderb b/Assets/Shaders/Text_VS.shshaderb
index c74dddbe..481e0950 100644
Binary files a/Assets/Shaders/Text_VS.shshaderb and b/Assets/Shaders/Text_VS.shshaderb differ
diff --git a/SHADE_Engine/src/Assets/SHAssetManager.cpp b/SHADE_Engine/src/Assets/SHAssetManager.cpp
index a7f4d8d9..32faf9b5 100644
--- a/SHADE_Engine/src/Assets/SHAssetManager.cpp
+++ b/SHADE_Engine/src/Assets/SHAssetManager.cpp
@@ -349,7 +349,13 @@ namespace SHADE
 		auto const ext{ path.extension().string() };
 		if (ext == GLSL_EXTENSION.data())
 		{
-      newPath = SHShaderSourceCompiler::LoadAndCompileShader(path).value();
+      auto value { SHShaderSourceCompiler::LoadAndCompileShader(path) };
+      if (!value.has_value())
+      {
+        SHLOG_ERROR("Shader compile failed: {}", path.string());
+        return;
+      }
+      newPath = value.value();
 		}
     else if (ext == GLTF_EXTENSION.data() || ext == FBX_EXTENSION.data())
     {