01d887
--- src/libnrtype/Layout-TNG-OutIter.cpp~       2018-03-11 16:38:09.000000000 -0400
01d887
+++ src/libnrtype/Layout-TNG-OutIter.cpp        2018-06-16 13:17:03.129605681 -0400
01d887
@@ -182,6 +182,8 @@
01d887
     if (_input_stream[source_index]->Type() != TEXT_SOURCE)
01d887
         return iterator(this, char_index);
01d887
01d887
+    if (char_index >= _characters.size())
01d887
+        return end();
01d887
     return iterator(this, char_index);
01d887
     /* This code was never used, the text_iterator argument was "NULL" in all calling code
01d887
     InputStreamTextSource const *text_source = static_cast<InputStreamTextSource const *>(_input_stream[source_index]);
01d887