diff --git a/.gradle/7.2/executionHistory/executionHistory.bin b/.gradle/7.2/executionHistory/executionHistory.bin
index 2745fb87..9fb69815 100644
Binary files a/.gradle/7.2/executionHistory/executionHistory.bin and b/.gradle/7.2/executionHistory/executionHistory.bin differ
diff --git a/.gradle/7.2/executionHistory/executionHistory.lock b/.gradle/7.2/executionHistory/executionHistory.lock
index 0c7de6d7..277072a6 100644
Binary files a/.gradle/7.2/executionHistory/executionHistory.lock and b/.gradle/7.2/executionHistory/executionHistory.lock differ
diff --git a/.gradle/7.2/fileHashes/fileHashes.bin b/.gradle/7.2/fileHashes/fileHashes.bin
index b4dd82f9..dd6c25da 100644
Binary files a/.gradle/7.2/fileHashes/fileHashes.bin and b/.gradle/7.2/fileHashes/fileHashes.bin differ
diff --git a/.gradle/7.2/fileHashes/fileHashes.lock b/.gradle/7.2/fileHashes/fileHashes.lock
index a0ef2c29..485b9499 100644
Binary files a/.gradle/7.2/fileHashes/fileHashes.lock and b/.gradle/7.2/fileHashes/fileHashes.lock differ
diff --git a/.gradle/7.2/fileHashes/resourceHashesCache.bin b/.gradle/7.2/fileHashes/resourceHashesCache.bin
index 1075d739..b535ce60 100644
Binary files a/.gradle/7.2/fileHashes/resourceHashesCache.bin and b/.gradle/7.2/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 8983f5b3..27090045 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock
index 87291137..3a9315b5 100644
Binary files a/.gradle/checksums/checksums.lock and b/.gradle/checksums/checksums.lock differ
diff --git a/FurnitureLib-Core/src/main/java/de/Ste3et_C0st/FurnitureLib/LimitationManager/PlayerLimitation.java b/FurnitureLib-Core/src/main/java/de/Ste3et_C0st/FurnitureLib/LimitationManager/PlayerLimitation.java
index 5bc1112c..cbe067e3 100644
--- a/FurnitureLib-Core/src/main/java/de/Ste3et_C0st/FurnitureLib/LimitationManager/PlayerLimitation.java
+++ b/FurnitureLib-Core/src/main/java/de/Ste3et_C0st/FurnitureLib/LimitationManager/PlayerLimitation.java
@@ -57,6 +57,6 @@ public void updateConfig(Project project) {
 
 	@Override
 	public Predicate<ObjectID> buildFilter(Location location, Project project, Player player) {
-		return objectID -> objectID.getProjectOBJ().equals(project) && objectID.getUUID().equals(player.getUniqueId());
+		return objectID -> objectID.hasProjectOBJ() && objectID.getProjectOBJ().equals(project) && objectID.getUUID().equals(player.getUniqueId());
 	}
 }
diff --git a/FurnitureLib-Core/src/main/java/de/Ste3et_C0st/FurnitureLib/main/ObjectData.java b/FurnitureLib-Core/src/main/java/de/Ste3et_C0st/FurnitureLib/main/ObjectData.java
index 558f4225..38b96319 100644
--- a/FurnitureLib-Core/src/main/java/de/Ste3et_C0st/FurnitureLib/main/ObjectData.java
+++ b/FurnitureLib-Core/src/main/java/de/Ste3et_C0st/FurnitureLib/main/ObjectData.java
@@ -72,6 +72,10 @@ public void setID(String s) {
     public String getProject() {
         return this.Project;
     }
+    
+    public boolean hasProjectOBJ() {
+    	return Objects.nonNull(this.getProjectOBJ());
+    }
 
     public Project getProjectOBJ() {
         return FurnitureManager.getInstance().getProject(this.Project);
diff --git a/buildSrc/.gradle/7.2/executionHistory/executionHistory.lock b/buildSrc/.gradle/7.2/executionHistory/executionHistory.lock
index 968013db..dc0ea92b 100644
Binary files a/buildSrc/.gradle/7.2/executionHistory/executionHistory.lock and b/buildSrc/.gradle/7.2/executionHistory/executionHistory.lock differ
diff --git a/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 376b01c4..6cbb37ff 100644
Binary files a/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ