diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6495e23d..26900d62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - General:
   - Support for `groups` of `outputs`
   - Internal templates import
+  - Better support for wrong pre-flight options (#360)
 - New output:
   - `vrml` export the 3D model in Virtual Reality Modeling Language (#349)
 - New internal filters:
diff --git a/tests/test_plot/test_yaml_errors.py b/tests/test_plot/test_yaml_errors.py
index 467ac809..81662268 100644
--- a/tests/test_plot/test_yaml_errors.py
+++ b/tests/test_plot/test_yaml_errors.py
@@ -707,3 +707,11 @@ def test_extends_1(test_dir):
     ctx.run(EXIT_BAD_CONFIG)
     assert ctx.search_err(r"In section 'position_mine' \(position\): Unknown output `position2` in `extends`")
     ctx.clean_up(keep_project=True)
+
+
+def test_pre_list_instead_of_dict(test_dir):
+    """ Extend an undefined output """
+    ctx = context.TestContext(test_dir, PRJ, 'error_pre_list_instead_of_dict_issue_360')
+    ctx.run(EXIT_BAD_CONFIG)
+    assert ctx.search_err(r"Found .*list.* instead of dict")
+    ctx.clean_up(keep_project=True)
diff --git a/tests/yaml_samples/error_pre_list_instead_of_dict_issue_360.kibot.yaml b/tests/yaml_samples/error_pre_list_instead_of_dict_issue_360.kibot.yaml
new file mode 100644
index 00000000..39878758
--- /dev/null
+++ b/tests/yaml_samples/error_pre_list_instead_of_dict_issue_360.kibot.yaml
@@ -0,0 +1,8 @@
+kibot:
+  version: 1
+
+preflight:
+  annotate_pcb:
+    - top_main_axis: y
+    - top_main_ascending: true
+