diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 4b0a2f7e24f..8be5d26e148 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -215,6 +215,10 @@ Bug Fixes
 * LUCENE-6054: Allow repeating the empty automaton (Nik Everett via
   Mike McCandless)
 
+* LUCENE-6049: Don't throw cryptic exception writing a segment when
+  the only docs in it had fields that hit non-aborting exceptions
+  during indexing but also had doc values.  (Mike McCandless)
+
 Documentation
 
 * LUCENE-5392: Add/improve analysis package documentation to reflect
diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
index f5f42d2827c..38866fc6033 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
@@ -619,6 +619,7 @@ public abstract class BaseTokenStreamTestCase extends LuceneTestCase {
               currentField = new Field("dummy", bogus, ft);
               doc.add(currentField);
             } else {
+              System.out.println("add doc=" + doc);
               iw.addDocument(doc);
               if (doc.getFields().size() > 1) {
                 // back to 1 field