diff --git a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java b/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java
index 8db607eb..1bfbef0a 100644
--- a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java
+++ b/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java
@@ -112,7 +112,7 @@ public abstract class AbstractGuiContainer<T extends AbstractGuiContainer<T>>
 
     @Override
     public T removeElement(GuiElement element) {
-        if (elements.remove(element) != null) {
+        if (elements.remove(element) != null && layedOutElements != null) {
             layedOutElements.remove(element);
         }
         return getThis();