diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea8f2c6..bdd3c67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,11 @@
 ### Deprecated
 ### Removed
 ### Fixed
+
+* YAML parsing error messages being replaced with a generic “unknown error”.
+* Memory leak when a YAML parsing error was encoutered.
+
+
 ### Security
 ### Contributors
 
diff --git a/yml.c b/yml.c
index 73e5083..40ece40 100644
--- a/yml.c
+++ b/yml.c
@@ -383,7 +383,7 @@ yml_load(FILE *yml, char **error)
                     yaml.context != NULL ? yaml.context : "");
             }
 
-            goto err;
+            goto err_no_error_formatting;
         }
 
         switch (event.type) {
@@ -550,6 +550,8 @@ err:
                  yaml.mark.line + 1, yaml.mark.column);
     }
 
+err_no_error_formatting:
+
     yml_destroy(root);
     yaml_parser_delete(&yaml);
     return NULL;