diff --git a/cmd/noms/diff/diff.go b/cmd/noms/diff/diff.go
index 28be39b33e..8656da6f14 100644
--- a/cmd/noms/diff/diff.go
+++ b/cmd/noms/diff/diff.go
@@ -82,7 +82,7 @@ func diffLists(w diffWriter, p types.Path, v1, v2 types.List) (err error) {
 
 		if splice.SpRemoved == splice.SpAdded {
 			// Heuristic: list only has modifications.
-			for i := uint64(0); i < splice.SpRemoved; i++ {
+			for i := uint64(0); i < splice.SpRemoved && err == nil; i++ {
 				lastEl := v1.Get(splice.SpAt + i)
 				newEl := v2.Get(splice.SpFrom + i)
 				if shouldDescend(lastEl, newEl) {