diff --git a/source/de/anomic/kelondro/kelondroTree.java b/source/de/anomic/kelondro/kelondroTree.java
index 97c09f486..2eb5bdb47 100644
--- a/source/de/anomic/kelondro/kelondroTree.java
+++ b/source/de/anomic/kelondro/kelondroTree.java
@@ -904,7 +904,7 @@ public class kelondroTree extends kelondroRecords implements Comparator, kelondr
         }
             
 	public boolean hasNext() {
-            return (rot) || (nextNode != null);
+            return (rot && (size() > 0)) || (nextNode != null);
 	}
 
         public Object next() {