Index: vhUnitTest/APPS/EC/impl/ExterneVerkoopService/OfferteBesteller/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/EC/impl/ExterneVerkoopService/OfferteBesteller/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/EC/impl/ExterneVerkoopService/OfferteBesteller/Test.cls.xml	(revision 45377)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.EC.impl.ExterneVerkoopService.OfferteBesteller.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Do ##class(vhTest.Dummy.TECH.PubSub.impl.PubSubAPI).MockInstance()
+]]></Implementation>
+</Method>
+
+<Method name="Test: BestelOfferte geeft foutmelding offerte">
+<Implementation><![CDATA[
+	Set OfferteMock = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteMock.IndienMethodCall("GeefKlantID").DanReturn("DummyKlantID")
+	
+	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Do OfferteServiceMock.IndienMethodCall("GeefOfferte", $$$ElkeWaarde).DanReturn(OfferteMock)
+	Do OfferteServiceMock.IndienMethodCall("GeefBestelStatusUpdater").DanReturn("")
+	
+	Set OfferteVoorBestellingValidatorMock = ##class(vhTest.Mock.APPS.EC.Verkoop.OfferteVoorBestellingValidator).%New()
+	Do OfferteVoorBestellingValidatorMock.IndienMethodCall("Valideer", $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde).DanException($$$DummyException)
+	
+	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("DummyException")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException",Substrings))
+
+	Set OfferteBesteller = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteBesteller).%New(OfferteServiceMock,"",OfferteVoorBestellingValidatorMock)
+	Do OfferteBesteller.BestelOfferte("DummyOfferteID","DummyKlantID", "DummyPersonalityID")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Ongeldige vhisie4 offerte geeft geen foutmelding">
+<Implementation><![CDATA[
+	Set OfferteMock = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteMock.IndienMethodCall("GeefKlantID").DanReturn("DummyKlantID")
+	Do OfferteMock.IndienMethodCall("GeefWinkelkarID").DanReturn("DummyWinkelkarID")
+	
+	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Do OfferteServiceMock.IndienMethodCall("GeefOfferte", $$$ElkeWaarde).DanReturn(OfferteMock)
+	Do OfferteServiceMock.IndienMethodCall("GeefBestelStatusUpdater").DanReturn("")
+	
+	Set OfferteVoorBestellingValidatorMock = ##class(vhTest.Mock.APPS.EC.Verkoop.OfferteVoorBestellingValidator).%New()
+	Do OfferteVoorBestellingValidatorMock.IndienMethodCall("Valideer", $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde).DanException(##class(APPS.VKP.Offerte.impl.OfferteNietMeerGeldigException).%ClassName(1))
+	
+	Set WinkelkarControleurMock = ##class(vhTest.Mock.APPS.EC.Winkelkar.WinkelkarControleur).%New()
+	Do WinkelkarControleurMock.IndienMethodCall("ControleerWinkelkarViaID","DummyWinkelkarID").DanDoeNiks()
+	
+	Set BestelStatusUpdaterMock = ##class(vhTest.Mock.APPS.VKP.Offerte.BestelStatusUpdater).%New()
+	Do BestelStatusUpdaterMock.IndienMethodCall("ZetStatusBesteld", $$$ElkeWaarde).DanDoeNiks()
+	
+	Set OfferteBesteller = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteBesteller).%New(OfferteServiceMock,"",OfferteVoorBestellingValidatorMock, WinkelkarControleurMock, BestelStatusUpdaterMock)
+	Do OfferteBesteller.BestelOfferte("DummyOfferteID","DummyKlantID", "DummyPersonalityID")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EC/impl/ExterneVerkoopService/OfferteBesteller.cls.xml
===================================================================
diff -u -r36803 -r45377
--- APPS/EC/impl/ExterneVerkoopService/OfferteBesteller.cls.xml	(.../OfferteBesteller.cls.xml)	(revision 36803)
+++ APPS/EC/impl/ExterneVerkoopService/OfferteBesteller.cls.xml	(.../OfferteBesteller.cls.xml)	(revision 45377)
@@ -46,7 +46,15 @@
 	
 	Set KlantID = Offerte.GeefKlantID()
 	
-	Do ..OfferteVoorBestellingValidator.Valideer(Offerte, KlantID, PersonalityID)
+	Try {	
+		Do ..OfferteVoorBestellingValidator.Valideer(Offerte, KlantID, PersonalityID)
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		If $$$Not( Exception.%Extends(##class(APPS.VKP.Offerte.impl.OfferteNietMeerGeldigException).%ClassName(1)) && Offerte.IsVhisie4()) {
+			Do ##class(TECH.ExceptionHandler).Throw(Exception)
+		}
+	}	
+
 	Do ..WinkelkarControleur.ControleerWinkelkarViaID(Offerte.GeefWinkelkarID())
 	Do ..BestelStatusUpdater.ZetStatusBesteld(Offerte)