2 files changed, 9 insertions, 4 deletions
diff --git a/src/main/java/bartworks/API/GlassTier.java b/src/main/java/bartworks/API/GlassTier.java
index 381dae28e1..64612549c9 100644
--- a/src/main/java/bartworks/API/GlassTier.java
+++ b/src/main/java/bartworks/API/GlassTier.java
@@ -33,6 +33,7 @@ public class GlassTier {
     }
 
     public static void addCustomGlass(@NotNull Block block, int meta, int tier) {
+        Objects.requireNonNull(block, "Glass block cannot be null");
         GlassTier.glasses.put(new BlockMetaPair(block, (byte) meta), tier);
     }
 
diff --git a/src/main/java/tectech/loader/MainLoader.java b/src/main/java/tectech/loader/MainLoader.java
index ab687fbbf9..b77bad31af 100644
--- a/src/main/java/tectech/loader/MainLoader.java
+++ b/src/main/java/tectech/loader/MainLoader.java
@@ -35,15 +35,19 @@ public final class MainLoader {
         } catch (Throwable t) {
             LOGGER.error("Loading textures...", t);
         }
-    }
 
-    public static void load() {
-        ProgressManager.ProgressBar progressBarLoad = ProgressManager.push("TecTech Loader", 6);
+        ProgressManager.ProgressBar progressBarPreload = ProgressManager.push("TecTech Preload", 1);
 
-        progressBarLoad.step("Regular Things");
+        progressBarPreload.step("Regular Things");
         new ThingsLoader().run();
         LOGGER.info("Block/Item Init Done");
 
+        ProgressManager.pop(progressBarPreload);
+    }
+
+    public static void load() {
+        ProgressManager.ProgressBar progressBarLoad = ProgressManager.push("TecTech Loader", 5);
+
         progressBarLoad.step("Machine Things");
         new MachineLoader().run();
         LOGGER.info("Machine Init Done");