diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12acd57..ce4bbce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
+## 8.2
+- Possibly fixes exception when using hotkeys in Inventories with a null-holder
+
 ## 8.1
 - Sort chest's inventory after using the new Fill-Chest-Hotkey
 - Prevent the new hotkeys from being used when allow-hotkeys is set to false
diff --git a/pom.xml b/pom.xml
index 6ef27fc..e28e7be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>de.jeffclan</groupId>
 	<artifactId>JeffChestSort</artifactId>
-	<version>8.1</version>
+	<version>8.2</version>
 	<packaging>jar</packaging>
 
 	<name>JeffChestSort</name>
diff --git a/src/main/java/de/jeffclan/JeffChestSort/JeffChestSortAdditionalHotkeyListener.java b/src/main/java/de/jeffclan/JeffChestSort/JeffChestSortAdditionalHotkeyListener.java
index c5fb6c0..1e42b82 100644
--- a/src/main/java/de/jeffclan/JeffChestSort/JeffChestSortAdditionalHotkeyListener.java
+++ b/src/main/java/de/jeffclan/JeffChestSort/JeffChestSortAdditionalHotkeyListener.java
@@ -31,7 +31,7 @@ public class JeffChestSortAdditionalHotkeyListener implements Listener {
 				&& e.getInventory().getType() != InventoryType.DROPPER
 				&& e.getInventory().getType() != InventoryType.ENDER_CHEST
 				&& e.getInventory().getType() != InventoryType.SHULKER_BOX
-				&& !e.getInventory().getHolder().getClass().toString().endsWith(".CraftBarrel")) {
+				&& (e.getInventory().getHolder() == null || !e.getInventory().getHolder().getClass().toString().endsWith(".CraftBarrel"))) {
 			return;
 		}
 		Player p = (Player) e.getWhoClicked();
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 1f79d17..430256b 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 main: de.jeffclan.JeffChestSort.JeffChestSortPlugin
 name: ChestSort
-version: 8.1
+version: 8.2
 api-version: 1.13
 description: Allows automatic chest sorting
 author: mfnalex