diff --git a/src/main/java/lambdasinaction/chap7/WordCount.java b/src/main/java/lambdasinaction/chap7/WordCount.java
index 13ccce52..8a43a0f3 100644
--- a/src/main/java/lambdasinaction/chap7/WordCount.java
+++ b/src/main/java/lambdasinaction/chap7/WordCount.java
@@ -83,8 +83,12 @@ private WordCounterSpliterator(String string) {
 
         @Override
         public boolean tryAdvance(Consumer<? super Character> action) {
-            action.accept(string.charAt(currentChar++));
-            return currentChar < string.length();
+            if(currentChar < string.length()) {
+                action.accept(string.charAt(currentChar++));
+                return true;
+            } else {
+                return false;
+            }
         }
 
         @Override