diff --git a/Glamourer/Interop/Material/MaterialService.cs b/Glamourer/Interop/Material/MaterialService.cs
index e232798..4893e14 100644
--- a/Glamourer/Interop/Material/MaterialService.cs
+++ b/Glamourer/Interop/Material/MaterialService.cs
@@ -1,6 +1,5 @@
 using FFXIVClientStructs.FFXIV.Client.Graphics.Kernel;
 using FFXIVClientStructs.FFXIV.Client.System.Resource.Handle;
-using Lumina.Data.Files;
 using Penumbra.GameData.Files.MaterialStructs;
 using Penumbra.GameData.Interop;
 using Texture = FFXIVClientStructs.FFXIV.Client.Graphics.Kernel.Texture;
@@ -69,7 +68,7 @@ public static unsafe class MaterialService
             return null;
 
         var material = (MaterialResourceHandle*) model.AsCharacterBase->MaterialsSpan[index].Value;
-        if (material == null || material->DataSet == null)
+        if (material == null || material->DataSet == null || material->DataSetSize < sizeof(ColorTable.Table) || !material->HasColorTable)
             return null;
 
         return (ColorTable.Table*)material->DataSet;
diff --git a/Glamourer/Interop/Material/PrepareColorSet.cs b/Glamourer/Interop/Material/PrepareColorSet.cs
index 21a731b..821a152 100644
--- a/Glamourer/Interop/Material/PrepareColorSet.cs
+++ b/Glamourer/Interop/Material/PrepareColorSet.cs
@@ -69,7 +69,7 @@ public sealed unsafe class PrepareColorSet
     public static bool TryGetColorTable(MaterialResourceHandle* material, StainIds stainIds,
         out ColorTable.Table table)
     {
-        if (material->DataSet == null)
+        if (material->DataSet == null || material->DataSetSize < sizeof(ColorTable.Table) || !material->HasColorTable)
         {
             table = default;
             return false;
diff --git a/repo.json b/repo.json
index 78132bf..9f7e922 100644
--- a/repo.json
+++ b/repo.json
@@ -17,8 +17,8 @@
       "Character"
     ],
     "InternalName": "Glamourer",
-    "AssemblyVersion": "1.5.1.1",
-    "TestingAssemblyVersion": "1.5.1.1",
+    "AssemblyVersion": "1.5.1.2",
+    "TestingAssemblyVersion": "1.5.1.2",
     "RepoUrl": "https://github.com/Ottermandias/Glamourer",
     "ApplicableVersion": "any",
     "DalamudApiLevel": 13,
@@ -27,9 +27,9 @@
     "IsTestingExclusive": "False",
     "DownloadCount": 1,
     "LastUpdate": 1618608322,
-    "DownloadLinkInstall": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.1/Glamourer.zip",
-    "DownloadLinkUpdate": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.1/Glamourer.zip",
-    "DownloadLinkTesting": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.1/Glamourer.zip",
+    "DownloadLinkInstall": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.2/Glamourer.zip",
+    "DownloadLinkUpdate": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.2/Glamourer.zip",
+    "DownloadLinkTesting": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.2/Glamourer.zip",
     "IconUrl": "https://raw.githubusercontent.com/Ottermandias/Glamourer/main/images/icon.png"
   }
 ]