Index: TRANSPC.mac.rou
===================================================================
diff -u -r44509 -r59933
--- TRANSPC.mac.rou	(.../TRANSPC.mac.rou)	(revision 44509)
+++ TRANSPC.mac.rou	(.../TRANSPC.mac.rou)	(revision 59933)
@@ -377,7 +377,7 @@
 OnTransportGeslotenAfhandeling
  Set $ZT = ""
  New Exception
- #dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch("APPS.TRANSP.GLS.Exceptions.CommunicatieException","TECH.Exceptions.InvalidInputException")
+ #dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch("APPS.TRANSP.GLS.Exceptions.CommunicatieException","APPS.TRANSP.Transsmart.Exceptions.CommunicatieException","TECH.Exceptions.InvalidInputException")
  Do ##class(vhLib.Logger).%New("").Warning("TransportGeslotenAfhandeling", "VervRef='"_VervRef_"'; Exception : '"_Exception.GeefOmschrijving()_"'; .")
  Do Boodschap^vhTXTPOP(Exception.GeefOmschrijving()) 
  Set $Piece(^TRANSP("D",VervRef),"\",2) = ""
Index: TRANSPE.mac.rou
===================================================================
diff -u -r57549 -r59933
--- TRANSPE.mac.rou	(.../TRANSPE.mac.rou)	(revision 57549)
+++ TRANSPE.mac.rou	(.../TRANSPE.mac.rou)	(revision 59933)
@@ -7,6 +7,17 @@
  Set R=$T(@TranspNr) Set:R="" R="DEFAULT(VervRef)"
  Do @R
  Quit
+ 
+ ; VRD
+5803(VervRef)
+ Do ##class(DOM.TRANSP.event.EventRaiser).RitGeslotenEvent(VervRef)
+ Quit
+
+ ; DHL
+8315(VervRef)
+ Do ##class(DOM.TRANSP.event.EventRaiser).RitGeslotenEvent(VervRef)
+ Quit
+
  ;
  ; GLS Freight
 5036(VervRef) 
Index: CHUI/MN/TRANSPCLOE.cls.xml
===================================================================
diff -u -r49352 -r59933
--- CHUI/MN/TRANSPCLOE.cls.xml	(.../TRANSPCLOE.cls.xml)	(revision 49352)
+++ CHUI/MN/TRANSPCLOE.cls.xml	(.../TRANSPCLOE.cls.xml)	(revision 59933)
@@ -26,7 +26,7 @@
 			
 		do CLOSVERV^TRANSPC(%J,.SelClose,"OT")
 	} catch {
-		set Exception = ##class(TECH.ExceptionHandler).Catch("APPS.TRANSP.GLS.Exceptions.CommunicatieException")
+		set Exception = ##class(TECH.ExceptionHandler).Catch("APPS.TRANSP.GLS.Exceptions.CommunicatieException","APPS.TRANSP.Transsmart.Exceptions.CommunicatieException")
 		Do ##class(vhLib.Logger).%New().LogExceptie(Exception)
 		do Boodschap^vhTXTPOP("Het transport kan niet worden afgesloten. Er zijn nog leveringen met foutieve status.")
 	}
Index: APPS/TRANSP/Transsmart/impl/CommunicatieService.cls.xml
===================================================================
diff -u -r59884 -r59933
--- APPS/TRANSP/Transsmart/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 59884)
+++ APPS/TRANSP/Transsmart/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 59933)
@@ -48,7 +48,7 @@
 <FormalSpec>RitID:%String</FormalSpec>
 <Implementation><![CDATA[
 	do ##class(vhLib.Logger).%New().Info(..%ClassName(1)_"::"_$$$CurrentMethod,"RitID " _ RitID)
-	Do ..ControleerRitVoorBevestiging(Rit)
+	Do ..ControleerRitVoorBevestiging(RitID)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/TRANSP/impl/CommunicatieService.cls.xml
===================================================================
diff -u -r40503 -r59933
--- APPS/TRANSP/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 40503)
+++ APPS/TRANSP/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 59933)
@@ -22,7 +22,7 @@
 	#dim Rit As DOM.TRANSP.Rit = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefRit(RitID)
 	#dim itLeveringID As TECH.ListIterator = Rit.GeefLeveringIDIterator()
 
-	Set StatusControleur = ##class(APPS.TRANSP.GLS.impl.StatusControleurDistributeurDataVisitor).%New()		
+	#dim StatusControleur as DOM.TRANSP.DistributeurDataVisitor = ..GeefStatusControleur(Rit)
 	while itLeveringID.HasNext() {
 		#dim Levering As DOM.TRANSP.Levering = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefLevering(RitID,itLeveringID.Next())
 		Set DistributeurDataIt = ##class(TECH.ListIterator).%New(Levering.GeefDistributeurDataLijst())
@@ -32,11 +32,30 @@
 		}
 	}
 
-	If 'StatusControleur.ZijnAlleStatussenInOrde() {
-		Do ##class(TECH.ExceptionHandler).Throw(##class(APPS.TRANSP.GLS.Exceptions.CommunicatieException).%New("Rit '"_RitID_"': "_StatusControleur.GeefInfo()))
+	If $$$Not(StatusControleur.ZijnAlleStatussenInOrde()) {
+		; TODO refactor smijten CommunicationException naar visitor.ZijnAlleStatussenInOrde
+		if ##class(TECH.StringUtils).Equals( Rit.GeefTransporteur(),##class(DOM.TRANSP.enu.Transporteur).VRD(),##class(DOM.TRANSP.enu.Transporteur).DHL()){
+			Do ##class(TECH.ExceptionHandler).Throw(##class(APPS.TRANSP.Transsmart.Exceptions.CommunicatieException).%New("Rit '"_RitID_"': "_StatusControleur.GeefInfo()))
+		} else {
+			Do ##class(TECH.ExceptionHandler).Throw(##class(APPS.TRANSP.GLS.Exceptions.CommunicatieException).%New("Rit '"_RitID_"': "_StatusControleur.GeefInfo()))
+		}
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="GeefStatusControleur">
+<FormalSpec>Rit:DOM.TRANSP.Rit</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.TRANSP.DistributeurDataVisitor</ReturnType>
+<Implementation><![CDATA[
+	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
+	If ##class(TECH.StringUtils).Equals(Rit.GeefTransporteur(),Transporteur.VRD,Transporteur.DHL){
+		Quit ##class(APPS.TRANSP.Transsmart.impl.StatusControleurDistributeurDataVisitor).%New()
+	} else {
+		Quit ##class(APPS.TRANSP.GLS.impl.StatusControleurDistributeurDataVisitor).%New()
+	}
+]]></Implementation>
+</Method>
 </Class>