Index: APPS/TRANSP/UPS/impl/Rate/Service/RatePort.cls.xml
===================================================================
diff -u -r32876 -r32882
--- APPS/TRANSP/UPS/impl/Rate/Service/RatePort.cls.xml	(.../RatePort.cls.xml)	(revision 32876)
+++ APPS/TRANSP/UPS/impl/Rate/Service/RatePort.cls.xml	(.../RatePort.cls.xml)	(revision 32882)
@@ -69,10 +69,6 @@
 		Do ##class(TECH.Exceptions.CommunicationErrorException).Throw("Kon geen gegevens ophalen van UPS Rate : " _Exception.ToString())
 		}
 
-	If ($$$Not($IsObject(Response))){
-		Do ##class(TECH.Exceptions.InvalidResponseException).Throw("Kon geen gegevens ophalen van UPS Rate")
-	}
-	
 	Quit Response
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/TRANSP/UPS/impl/Rate/Service/RatePort/Test.cls.xml
===================================================================
diff -u -r32876 -r32882
--- vhUnitTest/APPS/TRANSP/UPS/impl/Rate/Service/RatePort/Test.cls.xml	(.../Test.cls.xml)	(revision 32876)
+++ vhUnitTest/APPS/TRANSP/UPS/impl/Rate/Service/RatePort/Test.cls.xml	(.../Test.cls.xml)	(revision 32882)
@@ -37,17 +37,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Controle van de foutmelding bij lege response ">
-<Implementation><![CDATA[
-	Set RateServiceLeegResultaat = ##class(vhUnitTest.APPS.TRANSP.UPS.impl.Rate.Service.RatePort.WebmethodLeegResultaat).%New()
-	
-	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Kon geen gegevens ophalen van UPS Rate")
-	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidResponseException",Substrings))
-
-	#dim DummyResponse As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse = RateServiceLeegResultaat.Process(..GeefRateRequest())
-]]></Implementation>
-</Method>
-
 <Method name="GeefRateRequest">
 <Private>1</Private>
 <ReturnType>APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest</ReturnType>
Index: APPS/TRANSP/UPS/impl/Rate/ResponseValidator.cls.xml
===================================================================
diff -u -r32880 -r32882
--- APPS/TRANSP/UPS/impl/Rate/ResponseValidator.cls.xml	(.../ResponseValidator.cls.xml)	(revision 32880)
+++ APPS/TRANSP/UPS/impl/Rate/ResponseValidator.cls.xml	(.../ResponseValidator.cls.xml)	(revision 32882)
@@ -6,7 +6,10 @@
 <Method name="Valideer">
 <FormalSpec>Response:APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse,Request:APPS.TRANSP.UPS.impl.Rate.Service.rate.RateRequest</FormalSpec>
 <Implementation><![CDATA[
-	
+	If ($$$Not($IsObject(Response))){
+		Do ##class(TECH.Exceptions.InvalidResponseException).Throw("Kon geen gegevens ophalen van UPS Rate")
+	}
+
 	if (Response.Response.TransactionReference.CustomerContext '= Request.Request.TransactionReference.CustomerContext) {
 		Do ##class(TECH.Exceptions.InvalidResponseException).Throw("UPS response heeft verkeerde referentie : " _Response.Response.TransactionReference.CustomerContext)
 	}
Index: vhUnitTest/APPS/TRANSP/UPS/impl/Rate/ResponseValidator/Test.cls.xml
===================================================================
diff -u -r32880 -r32882
--- vhUnitTest/APPS/TRANSP/UPS/impl/Rate/ResponseValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 32880)
+++ vhUnitTest/APPS/TRANSP/UPS/impl/Rate/ResponseValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 32882)
@@ -3,6 +3,20 @@
 <Class name="vhUnitTest.APPS.TRANSP.UPS.impl.Rate.ResponseValidator.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Method name="Test: Controle van de foutmelding bij lege response ">
+<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 = ""
+	#dim Request As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateRequest = ..GeefRequest()
+	
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Kon geen gegevens ophalen van UPS Rate")
+	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 referentie">
 <Implementation><![CDATA[
 	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.Rate.ResponseValidator = ##class(APPS.TRANSP.UPS.impl.Rate.ResponseValidator).%New()