diff --git a/src/document/create.rs b/src/document/create.rs
index b142e4a..9c109f9 100644
--- a/src/document/create.rs
+++ b/src/document/create.rs
@@ -594,7 +594,11 @@ impl DocumentFile {
         for (field, data) in query.iter() {
             let id = match self.docdef.get_field_id(field) {
                 Ok(fid) => fid,
-                Err(err) => return Err(err),
+                Err(mut err) => {
+                    err.add_parent(ErrorID::Field(field.clone()));
+                    err.add_parent(ErrorID::Document(query.doc_name().clone()));
+                    return Err(err);
+                }
             };
             if indexed_ids.contains(&id) {
                 indexed.insert(id, data.clone());
@@ -1449,7 +1453,6 @@ mod document_files {
             _ => unreachable!("got {:?}: should have been a reply", action),
         }
     }
-    */
 
     #[test]
     fn errors_on_bad_field_name() {
@@ -1475,6 +1478,7 @@ mod document_files {
             _ => unreachable!("got {:?}: should have been a error", action),
         }
     }
+    */
 
     #[test]
     fn errors_on_bad_field_type_with_index() {
diff --git a/tests/query_test.rs b/tests/query_test.rs
index 04a928b..6606045 100644
--- a/tests/query_test.rs
+++ b/tests/query_test.rs
@@ -1,6 +1,9 @@
 mod support;
 
-use morethantext::{CalcValue, Calculation, Field, FieldType, IndexType, MoreThanText, Operand, Query};
+use morethantext::{
+    CalcValue, Calculation, DocDef, ErrorID, Field, FieldType, IndexType, MTTError, MoreThanText,
+    Name, Operand, Query,
+};
 use std::collections::HashSet;
 use support::TestDocument;
 
@@ -164,10 +167,14 @@ fn can_query_use_multiple_fields() {
     test_doc.populate_multiple(&mut mtt, input);
     let mut calc1 = Calculation::new(Operand::Equal);
     calc1.add_value("a").unwrap();
-    calc1.add_value(CalcValue::Existing(FieldType::StaticString)).unwrap();
+    calc1
+        .add_value(CalcValue::Existing(FieldType::StaticString))
+        .unwrap();
     let mut calc2 = Calculation::new(Operand::Equal);
     calc2.add_value("b").unwrap();
-    calc2.add_value(CalcValue::Existing(FieldType::StaticString)).unwrap();
+    calc2
+        .add_value(CalcValue::Existing(FieldType::StaticString))
+        .unwrap();
     let mut query = Query::new(test_doc.get_doc_name());
     query.add(test_doc.get_field_name(0), calc1);
     query.add(test_doc.get_field_name(1), calc2);
@@ -183,8 +190,12 @@ fn can_query_use_multiple_indexed_fields() {
     let mut mtt = MoreThanText::new();
     let test_doc = TestDocument::new(vec![FieldType::StaticString, FieldType::StaticString]);
     let mut docdef = test_doc.get_docdef();
-    docdef.add_index(&test_doc.get_field_name(0), IndexType::Index).unwrap();
-    docdef.add_index(&test_doc.get_field_name(1), IndexType::Index).unwrap();
+    docdef
+        .add_index(&test_doc.get_field_name(0), IndexType::Index)
+        .unwrap();
+    docdef
+        .add_index(&test_doc.get_field_name(1), IndexType::Index)
+        .unwrap();
     mtt.create_document(docdef).unwrap();
     let input = vec![
         vec!["a", "a"],
@@ -195,10 +206,14 @@ fn can_query_use_multiple_indexed_fields() {
     test_doc.populate_multiple(&mut mtt, input);
     let mut calc1 = Calculation::new(Operand::Equal);
     calc1.add_value("a").unwrap();
-    calc1.add_value(CalcValue::Existing(FieldType::StaticString)).unwrap();
+    calc1
+        .add_value(CalcValue::Existing(FieldType::StaticString))
+        .unwrap();
     let mut calc2 = Calculation::new(Operand::Equal);
     calc2.add_value("b").unwrap();
-    calc2.add_value(CalcValue::Existing(FieldType::StaticString)).unwrap();
+    calc2
+        .add_value(CalcValue::Existing(FieldType::StaticString))
+        .unwrap();
     let mut query = Query::new(test_doc.get_doc_name());
     query.add(test_doc.get_field_name(0), calc1);
     query.add(test_doc.get_field_name(1), calc2);
@@ -214,7 +229,9 @@ fn can_query_use_multiple_mixed_index_fields() {
     let mut mtt = MoreThanText::new();
     let test_doc = TestDocument::new(vec![FieldType::StaticString, FieldType::StaticString]);
     let mut docdef = test_doc.get_docdef();
-    docdef.add_index(&test_doc.get_field_name(0), IndexType::Index).unwrap();
+    docdef
+        .add_index(&test_doc.get_field_name(0), IndexType::Index)
+        .unwrap();
     mtt.create_document(docdef).unwrap();
     let input = vec![
         vec!["a", "a"],
@@ -225,10 +242,14 @@ fn can_query_use_multiple_mixed_index_fields() {
     test_doc.populate_multiple(&mut mtt, input);
     let mut calc1 = Calculation::new(Operand::Equal);
     calc1.add_value("a").unwrap();
-    calc1.add_value(CalcValue::Existing(FieldType::StaticString)).unwrap();
+    calc1
+        .add_value(CalcValue::Existing(FieldType::StaticString))
+        .unwrap();
     let mut calc2 = Calculation::new(Operand::Equal);
     calc2.add_value("b").unwrap();
-    calc2.add_value(CalcValue::Existing(FieldType::StaticString)).unwrap();
+    calc2
+        .add_value(CalcValue::Existing(FieldType::StaticString))
+        .unwrap();
     let mut query = Query::new(test_doc.get_doc_name());
     query.add(test_doc.get_field_name(0), calc1);
     query.add(test_doc.get_field_name(1), calc2);
@@ -238,3 +259,23 @@ fn can_query_use_multiple_mixed_index_fields() {
     assert_eq!(rec.get(test_doc.get_field_name(0)).unwrap(), "a".into());
     assert_eq!(rec.get(test_doc.get_field_name(1)).unwrap(), "b".into());
 }
+
+#[test]
+fn does_it_error_on_bad_field_name() {
+    let mut mtt = MoreThanText::new();
+    let doc_name = Name::english("holder");
+    let field_name = Name::english("missing");
+    let docdef = DocDef::new(doc_name.clone());
+    mtt.create_document(docdef);
+    let mut calc = Calculation::new(Operand::Equal);
+    calc.add_value("a").unwrap();
+    calc.add_value(CalcValue::Existing(FieldType::StaticString))
+        .unwrap();
+    let mut qry = Query::new(doc_name.clone());
+    qry.add(field_name.clone(), calc);
+    let mut expected = MTTError::new(ErrorID::NameNotFound(field_name.clone().into()));
+    expected.add_parent(ErrorID::Field(field_name.clone().into()));
+    expected.add_parent(ErrorID::Document(doc_name.clone().into()));
+    let result = mtt.records(qry).unwrap_err();
+    assert_eq!(result.to_string(), expected.to_string());
+}