Index: AXimpl/SqlQueryConnection.cls.xml
===================================================================
diff -u -r43028 -r43780
--- AXimpl/SqlQueryConnection.cls.xml	(.../SqlQueryConnection.cls.xml)	(revision 43028)
+++ AXimpl/SqlQueryConnection.cls.xml	(.../SqlQueryConnection.cls.xml)	(revision 43780)
@@ -3,21 +3,36 @@
 <Class name="AXimpl.SqlQueryConnection">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="AxCon">
+<Type>%SQLGatewayConnection</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="GetResultSet">
 <FormalSpec>SqlStatement:%String</FormalSpec>
 <ReturnType>TECH.ResultSet</ReturnType>
 <Implementation><![CDATA[
-    Set AXCon=##class(%SQLGatewayConnection).%New()
+    Set ..AxCon=##class(%SQLGatewayConnection).%New()
     #dim AXServer As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("AXimpl.SqlGatewayConnection_ConnectionDataSourceName")
     
-    Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(AXCon.Connect(AXServer,"",""))
+    Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(..AxCon.Connect(AXServer,"",""))
     
-    Set res=##class(TECH.ResultSet).%New("%DynamicQueryGW:SQLGW")
-    Do res.Prepare(SqlStatement,,AXCon)
-    Do res.Execute()
+    try {
+	    Set res=##class(TECH.ResultSet).%New("%DynamicQueryGW:SQLGW")
+    	Do res.Prepare(SqlStatement,,..AxCon)
+    	Do res.Execute()
+    } catch {
+	    do ..AxCon.Disconnect()
+	    do ##class(TECH.ExceptionHandler).Rethrow()
+    }
     quit res
 ]]></Implementation>
 </Method>
+
+<Method name="Disconnect">
+<Implementation><![CDATA[	Do ..AxCon.Disconnect()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AXimpl/Controle/Order/Ax/AxOrderLijnIterator.cls.xml
===================================================================
diff -u -r43052 -r43780
--- AXimpl/Controle/Order/Ax/AxOrderLijnIterator.cls.xml	(.../AxOrderLijnIterator.cls.xml)	(revision 43052)
+++ AXimpl/Controle/Order/Ax/AxOrderLijnIterator.cls.xml	(.../AxOrderLijnIterator.cls.xml)	(revision 43780)
@@ -64,6 +64,17 @@
 	Quit ConvertedAxProductOrderLijn
 ]]></Implementation>
 </Method>
+
+<Method name="%OnClose">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Do:$IsObject(..ResultSet) ..SqlQueryConnection.Disconnect()
+	Quit $$$OK
+]]></Implementation>
+</Method>
 </Class>