diff --git a/Assemblies/ExtendedStorage.dll b/Assemblies/ExtendedStorage.dll
index 9493c6e..fd5a6af 100644
Binary files a/Assemblies/ExtendedStorage.dll and b/Assemblies/ExtendedStorage.dll differ
diff --git a/Source/ExtendedStorage/Building_ExtendedStorage.cs b/Source/ExtendedStorage/Building_ExtendedStorage.cs
index b2c80ef..6d0cc07 100644
--- a/Source/ExtendedStorage/Building_ExtendedStorage.cs
+++ b/Source/ExtendedStorage/Building_ExtendedStorage.cs
@@ -104,7 +104,11 @@ public override void DrawGUIOverlay()
             Color labelColor = new Color(1f, 1f, 0.5f, 0.75f); // yellowish white for our total stack counts - default is GenMapUI.DefaultThingLabelColor
 
             if (!string.IsNullOrEmpty(_label))
-                GenMapUI.DrawThingLabel(StoredThings.First(), _label, labelColor);
+            {
+                var thing = StoredThings.FirstOrDefault();
+                if (thing != null)
+                    GenMapUI.DrawThingLabel(thing, _label, labelColor);
+            }
         }
 
         public override void Draw()