Index: CHUI/VKP/OrderWeergave/VerzendinfoBepaler.cls.xml
===================================================================
diff -u -r51902 -r51913
--- CHUI/VKP/OrderWeergave/VerzendinfoBepaler.cls.xml	(.../VerzendinfoBepaler.cls.xml)	(revision 51902)
+++ CHUI/VKP/OrderWeergave/VerzendinfoBepaler.cls.xml	(.../VerzendinfoBepaler.cls.xml)	(revision 51913)
@@ -26,15 +26,15 @@
 <Implementation><![CDATA[
 	#dim Verzendinfo As CHUI.VKP.OrderWeergave.VerzendinfoDto = ##class(CHUI.VKP.OrderWeergave.VerzendinfoDto).%New()
 	
-	Quit:($$$Not(..OrderApi.BestaatOrder(OrderId))) Verzendinfo
+	If (..OrderApi.BestaatOrder(OrderId)) {
+		#dim Order As DOM.VKP.Order = ..OrderApi.GeefOrder(OrderId)
+		#dim Leveradres As DOM.common.Adres = Order.GeefAfleveradres()
+		#dim VerzendingWijze As %String = Order.GeefVerzendingWijze()
+		
+		Set Verzendinfo.Leveradres = Leveradres
+		Set Verzendinfo.VerzendingWijze = VerzendingWijze
+	}
 	
-	#dim Order As DOM.VKP.Order = ..OrderApi.GeefOrder(OrderId)
-	#dim Leveradres As DOM.common.Adres = Order.GeefAfleveradres()
-	#dim VerzendingWijze As %String = Order.GeefVerzendingWijze()
-	
-	Set Verzendinfo.Leveradres = Leveradres
-	Set Verzendinfo.VerzendingWijze = VerzendingWijze
-	
 	Quit Verzendinfo
 ]]></Implementation>
 </Method>
Index: CHUI/MN/RPLKLSPEC.cls.xml
===================================================================
diff -u -r51899 -r51913
--- CHUI/MN/RPLKLSPEC.cls.xml	(.../RPLKLSPEC.cls.xml)	(revision 51899)
+++ CHUI/MN/RPLKLSPEC.cls.xml	(.../RPLKLSPEC.cls.xml)	(revision 51913)
@@ -1069,6 +1069,7 @@
 <ClassMethod>1</ClassMethod>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+	New result
 	#dim result As %Boolean = 0
 	If $G(VTB)="O" set result = 1
 	Quit result
@@ -1078,7 +1079,7 @@
 <Method name="BekijkVerzendgegevens">
 <ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[
-	#dim Verzendgegevens, OrderId, PopupDetail As %String
+	New Verzendgegevens, OrderId, VerzendInfo, PopupDetail
 	
 	Set OrderId = $P($G(^HULP($J,"K"_KC,"O",ORD(6))),D,15)
 	#dim VerzendInfo As CHUI.VKP.OrderWeergave.VerzendinfoDto = ##class(CHUI.VKP.OrderWeergave.VerzendinfoBepaler).%New().GeefVerzendinfoVolgensOrderNummer(OrderId)