diff --git a/README.md b/README.md
index 1c2881b..1e7db80 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ---
 
-**Create: Lemon-Mates** is a refreshing addon mod for Create, adding various lemonade drinks
+**Create: Lemon-Mates** is a refreshing addon mod for Create, adding various lemonade drinks 
 and everything you need to produce them - bottles, labels, caps, fruits and of course lemonade.
 Build your own lemonade factory with fully automated Create assembly lines!
 
diff --git a/src/main/java/net/doppelr/lemonmates/block/ModDrinkingGlassBlock.java b/src/main/java/net/doppelr/lemonmates/block/ModDrinkingGlassBlock.java
index 436b6aa..4c55ce1 100644
--- a/src/main/java/net/doppelr/lemonmates/block/ModDrinkingGlassBlock.java
+++ b/src/main/java/net/doppelr/lemonmates/block/ModDrinkingGlassBlock.java
@@ -87,7 +87,7 @@ protected InteractionResult useWithoutItem(BlockState state, Level level, BlockP
     protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) {
         if (stack.getItem() instanceof ModJugItem jugItem && Boolean.TRUE.equals(stack.get(AllDataComponents.CAN_POUR))) {
             if (state.getValue(DRINK_LEVEL) != 2) {
-                if (stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) != null || stack.get(AllDataComponents.JUG_LEVEL) != 0) {
+                if (stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) != null || (stack.get(AllDataComponents.JUG_LEVEL) != null && stack.get(AllDataComponents.JUG_LEVEL) != 0)) {
                     int newDrinkLevel = stack.get(AllDataComponents.JUG_LEVEL) > 0 ? 2 - state.getValue(DRINK_LEVEL) : 0;
                     if (stack.get(AllDataComponents.JUG_LEVEL) == 1 || state.getValue(DRINK_LEVEL) == 1)
                         newDrinkLevel = 1;
diff --git a/src/main/java/net/doppelr/lemonmates/item/ModJugItem.java b/src/main/java/net/doppelr/lemonmates/item/ModJugItem.java
index baba71e..7568004 100644
--- a/src/main/java/net/doppelr/lemonmates/item/ModJugItem.java
+++ b/src/main/java/net/doppelr/lemonmates/item/ModJugItem.java
@@ -89,7 +89,7 @@ public InteractionResult useOn(UseOnContext context) {
         Level level = context.getLevel();
         BlockPos pos = context.getClickedPos();
         BlockState state = level.getBlockState(pos);
-        if (stack.get(AllDataComponents.CAN_POUR) && state.getBlock() instanceof ModDrinkingGlassBlock)
+        if (stack.get(AllDataComponents.CAN_POUR) != null && stack.get(AllDataComponents.CAN_POUR) && state.getBlock() instanceof ModDrinkingGlassBlock)
             return InteractionResult.SUCCESS;
         return super.useOn(context);
     }