diff --git a/src/View/Parsers/Diff.php b/src/View/Parsers/Diff.php
index 89a9cfaeb..73b6a105d 100644
--- a/src/View/Parsers/Diff.php
+++ b/src/View/Parsers/Diff.php
@@ -187,6 +187,9 @@ class Diff extends \Diff
                 $newChunk = $item;
                 while ($item[strlen($item)-1] != ">") {
                     $chunk = each($candidateChunks);
+                    if ($chunk === false) {
+                        break;
+                    }
                     $item = $chunk['value'];
                     $newChunk .= ' ' . $item;
                 }