diff --git a/changelog.md b/changelog.md
index 4b21178181..c163b023f3 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,7 @@
+# 7.5.17
+
+* Now its compatible with Cobblemon!
+
 # 7.5.16
 
 * Fixed issues with building jars
diff --git a/common/src/main/java/net/mca/resources/Dialogues.java b/common/src/main/java/net/mca/resources/Dialogues.java
index 909762cf31..75703e5989 100644
--- a/common/src/main/java/net/mca/resources/Dialogues.java
+++ b/common/src/main/java/net/mca/resources/Dialogues.java
@@ -46,7 +46,9 @@ private void loadDialogue(Identifier identifier, JsonElement element) {
         String id = identifier.getPath().substring(identifier.getPath().lastIndexOf('/') + 1);
         if (!this.checkIsMcaDialogue(element)) {
             MCA.LOGGER.warn("Dialogue {} is not properly formatted, not loading", identifier);
+            return;
         }
+
         Question q = Question.fromJson(id, element.getAsJsonObject());
 
         // Merge questions to allow injections