Merge 90cca03 into 3b702a4

jknack · Jul 27, 2018 · 3d3f7bb · 3d3f7bb
2 parents 3b702a4 + 90cca03
commit 3d3f7bb
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/handlebars/src/main/java/com/github/jknack/handlebars/internal/FormatterChain.java b/handlebars/src/main/java/com/github/jknack/handlebars/internal/FormatterChain.java
@@ -61,8 +61,12 @@ private FormatterChain(final List<Formatter> formatter, final int index) {
    * Gets the next formatter in the chain.
    * @return The formatter at the next index.
    */
-  private FormatterChain next() {
-    return new FormatterChain(chain, index + 1);
+  private Formatter.Chain next() {
+    if (index < chain.size()) {
+      return new FormatterChain(chain, index + 1);
+    } else {
+      return Formatter.NOOP;
+    }
   }
 
   @Override