diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5b2687c07..ecd20c5bf 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -75,6 +75,7 @@
         "typeinfo": "cpp",
         "unordered_map": "cpp",
         "utility": "cpp",
-        "vector": "cpp"
+        "vector": "cpp",
+        "*.ipp": "cpp"
     }
 }
\ No newline at end of file
diff --git a/src/generic/stage1/json_structural_indexer.h b/src/generic/stage1/json_structural_indexer.h
index 012b84ca1..b0c34cb1d 100644
--- a/src/generic/stage1/json_structural_indexer.h
+++ b/src/generic/stage1/json_structural_indexer.h
@@ -188,8 +188,15 @@ simdjson_really_inline size_t trim_partial_utf8(const uint8_t *buf, size_t len)
 template<size_t STEP_SIZE>
 error_code json_structural_indexer::index(const uint8_t *buf, size_t len, dom_parser_implementation &parser, stage1_mode partial) noexcept {
   if (simdjson_unlikely(len > parser.capacity())) { return CAPACITY; }
-  if (is_streaming(partial)) { len = trim_partial_utf8(buf, len); }
-
+  // We guard the rest of the code so that we can assume that len > 0 throughout.
+  if (len == 0) { return EMPTY; }
+  if (is_streaming(partial)) {
+    len = trim_partial_utf8(buf, len);
+    // If you end up with an empty window after trimming
+    // the partial UTF-8 bytes, then chances are good that you
+    // have an UTF-8 formatting error.
+    if(len == 0) { return UTF8_ERROR; }
+  }
   buf_block_reader<STEP_SIZE> reader(buf, len);
   json_structural_indexer indexer(parser.structural_indexes.get());
 
@@ -197,12 +204,11 @@ error_code json_structural_indexer::index(const uint8_t *buf, size_t len, dom_pa
   while (reader.has_full_block()) {
     indexer.step<STEP_SIZE>(reader.full_block(), reader);
   }
-
-  // Take care of the last block (will always be there unless file is empty)
+  // Take care of the last block (will always be there unless file is empty which is
+  // not supposed to happen.)
   uint8_t block[STEP_SIZE];
-  if (simdjson_unlikely(reader.get_remainder(block) == 0)) { return EMPTY; }
+  if (simdjson_unlikely(reader.get_remainder(block) == 0)) { return UNEXPECTED_ERROR; }
   indexer.step<STEP_SIZE>(block, reader);
-
   return indexer.finish(parser, reader.block_index(), len, partial);
 }
 
@@ -236,7 +242,6 @@ simdjson_really_inline void json_structural_indexer::next(const simd::simd8x64<u
 simdjson_really_inline error_code json_structural_indexer::finish(dom_parser_implementation &parser, size_t idx, size_t len, stage1_mode partial) {
   // Write out the final iteration's structurals
   indexer.write(uint32_t(idx-64), prev_structurals);
-
   error_code error = scanner.finish();
   // We deliberately break down the next expression so that it is
   // human readable.
diff --git a/tests/dom/document_stream_tests.cpp b/tests/dom/document_stream_tests.cpp
index 2c3fef4ba..02e7d8bcb 100644
--- a/tests/dom/document_stream_tests.cpp
+++ b/tests/dom/document_stream_tests.cpp
@@ -807,8 +807,25 @@ namespace document_stream_tests {
     return true;
   }
 
+  bool issue1649() {
+    std::cout << "Running " << __func__ << std::endl;
+    std::size_t batch_size = 637;
+    const auto json=simdjson::padded_string(std::string("\xd7"));
+    simdjson::dom::parser parser;
+    simdjson::dom::document_stream docs;
+    if(parser.parse_many(json,batch_size).get(docs)) {
+          return false;
+    }
+    size_t bool_count=0;
+    for (auto doc : docs) {
+      bool_count += doc.is_bool();
+    }
+    return true;
+  }
+
   bool run() {
-    return adversarial_single_document_array() &&
+    return issue1649() &&
+           adversarial_single_document_array() &&
            adversarial_single_document() &&
            unquoted_key() &&
            stress_data_race() &&