Index: APPS/TRANSP/UPS/impl/Rate/ResponseValidator.cls.xml
===================================================================
diff -u -r32683 -r32880
--- APPS/TRANSP/UPS/impl/Rate/ResponseValidator.cls.xml	(.../ResponseValidator.cls.xml)	(revision 32683)
+++ APPS/TRANSP/UPS/impl/Rate/ResponseValidator.cls.xml	(.../ResponseValidator.cls.xml)	(revision 32880)
@@ -8,11 +8,11 @@
 <Implementation><![CDATA[
 	
 	if (Response.Response.TransactionReference.CustomerContext '= Request.Request.TransactionReference.CustomerContext) {
-		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("UPS response heeft verkeerde referentie : " _Response.Response.TransactionReference.CustomerContext)
+		Do ##class(TECH.Exceptions.InvalidResponseException).Throw("UPS response heeft verkeerde referentie : " _Response.Response.TransactionReference.CustomerContext)
 	}
 
 	if ((Response.Response.ResponseStatus.Code '= "1") || (Response.Response.ResponseStatus.Description '= "Success")) {
-		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("UPS response verwacht 1 als status voor ref : " _Response.Response.TransactionReference.CustomerContext)
+		Do ##class(TECH.Exceptions.InvalidResponseException).Throw("UPS response verwacht 1 als status voor ref : " _Response.Response.TransactionReference.CustomerContext)
 	}
 
 	Quit
Index: vhUnitTest/APPS/TRANSP/UPS/impl/Rate/ResponseValidator/Test.cls.xml
===================================================================
diff -u -r32701 -r32880
--- vhUnitTest/APPS/TRANSP/UPS/impl/Rate/ResponseValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 32701)
+++ vhUnitTest/APPS/TRANSP/UPS/impl/Rate/ResponseValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 32880)
@@ -3,6 +3,32 @@
 <Class name="vhUnitTest.APPS.TRANSP.UPS.impl.Rate.ResponseValidator.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Method name="Test: UPS Response Valideerder - Response met verkeerde referentie">
+<Implementation><![CDATA[
+	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.Rate.ResponseValidator = ##class(APPS.TRANSP.UPS.impl.Rate.ResponseValidator).%New()
+	#dim Response As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse = ..GeefResponseMetVerkeerdeReferentie()
+	#dim Request As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateRequest = ..GeefRequest()
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("UPS response heeft verkeerde referentie : 2")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidResponseException",Substrings))
+
+	Do ResponseValideerder.Valideer(Response, Request)
+]]></Implementation>
+</Method>
+
+<Method name="Test: UPS Response Valideerder - Response met verkeerde status">
+<Implementation><![CDATA[
+	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.Rate.ResponseValidator = ##class(APPS.TRANSP.UPS.impl.Rate.ResponseValidator).%New()
+	#dim Response As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse = ..GeefResponseMetVerkeerdeStatus()
+	#dim Request As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateRequest = ..GeefRequest()
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("UPS response verwacht 1 als status voor ref : 1")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidResponseException",Substrings))
+
+	Do ResponseValideerder.Valideer(Response, Request)
+]]></Implementation>
+</Method>
+
 <Method name="Test: UPS Response Valideerder">
 <Implementation><![CDATA[
 	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.Rate.ResponseValidator = ##class(APPS.TRANSP.UPS.impl.Rate.ResponseValidator).%New()
@@ -15,6 +41,62 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefResponseMetVerkeerdeReferentie">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse</ReturnType>
+<Implementation><![CDATA[
+	Set Response = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse).%New()
+
+	Set Response.Response.ResponseStatus.Code = "1"
+	Set Response.Response.ResponseStatus.Description = "Succes"
+	
+	Set Response.Response.TransactionReference.CustomerContext = "2"
+	Set Response.Response.TransactionReference.TransactionIdentifier = "2"
+
+	For Item=1:1:5 {
+		Set RatedShipment = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.RatedShipmentType).%New()
+		
+		Set RatedShipment.Service.Code = Item
+		Set RatedShipment.GuaranteedDelivery.BusinessDaysInTransit = "1"
+		Set RatedShipment.BillingWeight.UnitOfMeasurement = "KGS" 
+		Set RatedShipment.BillingWeight.Weight = Item * 5 
+		Set RatedShipment.TotalCharges.CurrencyCode = "EUR"
+		Set RatedShipment.TotalCharges.MonetaryValue  = Item * 10
+		
+		Do Response.RatedShipment.Insert(RatedShipment)	
+	}
+	Quit Response
+]]></Implementation>
+</Method>
+
+<Method name="GeefResponseMetVerkeerdeStatus">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse</ReturnType>
+<Implementation><![CDATA[
+	Set Response = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse).%New()
+
+	Set Response.Response.ResponseStatus.Code = "2"
+	Set Response.Response.ResponseStatus.Description = "Failed"
+	
+	Set Response.Response.TransactionReference.CustomerContext = "1"
+	Set Response.Response.TransactionReference.TransactionIdentifier = "1"
+
+	For Item=1:1:5 {
+		Set RatedShipment = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.RatedShipmentType).%New()
+		
+		Set RatedShipment.Service.Code = Item
+		Set RatedShipment.GuaranteedDelivery.BusinessDaysInTransit = "1"
+		Set RatedShipment.BillingWeight.UnitOfMeasurement = "KGS" 
+		Set RatedShipment.BillingWeight.Weight = Item * 5 
+		Set RatedShipment.TotalCharges.CurrencyCode = "EUR"
+		Set RatedShipment.TotalCharges.MonetaryValue  = Item * 10
+		
+		Do Response.RatedShipment.Insert(RatedShipment)	
+	}
+	Quit Response
+]]></Implementation>
+</Method>
+
 <Method name="GeefResponse">
 <Private>1</Private>
 <ReturnType>APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse</ReturnType>