Index: TECH/ListIterator.cls.xml
===================================================================
diff -u -r1074 -r1508
--- TECH/ListIterator.cls.xml	(.../ListIterator.cls.xml)	(revision 1074)
+++ TECH/ListIterator.cls.xml	(.../ListIterator.cls.xml)	(revision 1508)
@@ -54,11 +54,17 @@
 Causes an error if HasNext() returns false</Description>
 <ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[
-	Set Result = ..Item
-	Set Key = ..Key
-	Set ..CurrentKey = Key
-	Set ..Item = ..List.GetNext(.Key)
-	Set ..Key = Key
+	
+	If ..HasNext(){
+		Set Result = ..Item
+		Set Key = ..Key
+		Set ..CurrentKey = Key
+		Set ..Item = ..List.GetNext(.Key)
+		Set ..Key = Key
+	}Else{
+		Set ErrorMsg = ..%ClassName(1)_": Geen volgend item meer, einde van lijst is bereikt."
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),ErrorMsg))			
+	}
 	Quit Result
 ]]></Implementation>
 </Method>