diff --git a/main/src/main/java/me/blackvein/quests/Quests.java b/main/src/main/java/me/blackvein/quests/Quests.java
index 93528abb2..391130ea7 100644
--- a/main/src/main/java/me/blackvein/quests/Quests.java
+++ b/main/src/main/java/me/blackvein/quests/Quests.java
@@ -2489,6 +2489,11 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
                                     for (final String item : items) {
                                         final ItemStack is = ItemUtil.readItemStack("" + item);
                                         if (index <= itemDeliveryTargetIds.size()) {
+                                            if (itemDeliveryTargetIds.size() != deliveryMessages.size()) {
+                                                throw new StageFormatException(
+                                                        "delivery-messages must be same size as items-to-deliver",
+                                                        quest, stageNum);
+                                            }
                                             final int npcId = itemDeliveryTargetIds.get(index);
                                             final String msg = deliveryMessages.size() > index 
                                                     ? deliveryMessages.get(index) 
@@ -2512,8 +2517,9 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
                                                             quest, stageNum);
                                                 }
                                             } else {
-                                                throw new StageFormatException("items-to-deliver has invalid formatting " 
-                                                        + item, quest, stageNum);
+                                                throw new StageFormatException(
+                                                        "items-to-deliver has invalid formatting " + item, quest, 
+                                                        stageNum);
                                             }
                                         } else {
                                             throw new StageFormatException("items-to-deliver is missing target IDs"