diff --git a/core/src/main/java/tc/oc/pgm/death/DeathMessageBuilder.java b/core/src/main/java/tc/oc/pgm/death/DeathMessageBuilder.java
index e56e6c8f27..55832e0820 100644
--- a/core/src/main/java/tc/oc/pgm/death/DeathMessageBuilder.java
+++ b/core/src/main/java/tc/oc/pgm/death/DeathMessageBuilder.java
@@ -184,7 +184,7 @@ boolean ranged(RangedInfo rangedInfo, @Nullable Location distanceReference) {
   }
 
   boolean potion(PotionInfo potionInfo) {
-    if (option("potion")) {
+    if (potionInfo.getPotionEffect() != null && option("potion")) {
       weapon = potionInfo.getName();
       return true;
     }