Index: vhUnitTest/WSimpl/AX/CHUI/TerminalNavigationService/CreateAndNavigateToTemporaryOrder/Test.cls.xml
===================================================================
diff -u -r43395 -r43693
--- vhUnitTest/WSimpl/AX/CHUI/TerminalNavigationService/CreateAndNavigateToTemporaryOrder/Test.cls.xml	(.../Test.cls.xml)	(revision 43395)
+++ vhUnitTest/WSimpl/AX/CHUI/TerminalNavigationService/CreateAndNavigateToTemporaryOrder/Test.cls.xml	(.../Test.cls.xml)	(revision 43693)
@@ -22,6 +22,39 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test opvangen exception tijdens Order creatie en aangepast response message">
+<Implementation><![CDATA[
+	Set OrderLevenCyclusMock = ##class(vhTest.Mock.AXimpl.Admin.VKP.OrderLevenCyclus).%New()
+	Set TerminalNavigatieService = ##class(vhTest.Mock.AXimpl.Admin.CHUI.TerminalNavigationService).%New()
+	
+	Set Exception  = ##class(TECH.Exceptions.AbstractOmschrijvingException).%New("Er liep iets mis tijdens de order generatie")
+	Do OrderLevenCyclusMock.IndienMethodCall("GenereerOrder","AxCustomerId","AxSalesId").DanException(Exception)
+
+	Set Service = ##class(WSimpl.AX.CHUI.TerminalNavigationService.CreateAndNavigateToTemporaryOrder).%New(OrderLevenCyclusMock,TerminalNavigatieService)
+	#dim Response as WS.AX.CHUI.dto.CreateAndNavigateToTemporaryOrderResponse = Service.CreateAndNavigateToTemporaryOrder(..GeefRequest())
+
+	do $$$AssertEquals(Response.Message,"Er liep iets mis tijdens de order generatie")
+]]></Implementation>
+</Method>
+
+<Method name="Test response message indien exception tijdens navigatie opdracht">
+<Implementation><![CDATA[
+	Set OrderLevenCyclusMock = ##class(vhTest.Mock.AXimpl.Admin.VKP.OrderLevenCyclus).%New()
+	Do OrderLevenCyclusMock.VerwachtMethodCall("GenereerOrder","AxCustomerId","AxSalesId").DanDoeNiks()
+
+	Set Exception = ##class(AXimpl.Admin.DatabaseOutOfSyncException).%New(##class(AXimpl.Admin.EntiteitType).Gebruiker(),"AxGebruiker","")
+	Set TerminalNavigatieService = ##class(vhTest.Mock.AXimpl.Admin.CHUI.TerminalNavigationService).%New()
+	Do TerminalNavigatieService.IndienMethodCall("RaadpleegOrder","AxSalesId","AxUser","AxWorkStation").DanException(Exception)
+
+	Set Service = ##class(WSimpl.AX.CHUI.TerminalNavigationService.CreateAndNavigateToTemporaryOrder).%New(OrderLevenCyclusMock,TerminalNavigatieService)
+	#dim Response as WS.AX.CHUI.dto.CreateAndNavigateToTemporaryOrderResponse = Service.CreateAndNavigateToTemporaryOrder(..GeefRequest())
+
+	do $$$AssertEquals(Response.Message,"Het order is gegenereerd, maar er is iets fout gegaan met het registreren van de Admin navigatie opdracht")
+	
+	Do OrderLevenCyclusMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="GeefRequest">
 <Private>1</Private>
 <ReturnType>WS.AX.CHUI.dto.CreateAndNavigateToTemporaryOrderRequest</ReturnType>
Index: WSimpl/AX/CHUI/TerminalNavigationService/CreateAndNavigateToTemporaryOrder.cls.xml
===================================================================
diff -u -r43405 -r43693
--- WSimpl/AX/CHUI/TerminalNavigationService/CreateAndNavigateToTemporaryOrder.cls.xml	(.../CreateAndNavigateToTemporaryOrder.cls.xml)	(revision 43405)
+++ WSimpl/AX/CHUI/TerminalNavigationService/CreateAndNavigateToTemporaryOrder.cls.xml	(.../CreateAndNavigateToTemporaryOrder.cls.xml)	(revision 43693)
@@ -30,9 +30,20 @@
 <FormalSpec>CANTORequest:WS.AX.CHUI.dto.CreateAndNavigateToTemporaryOrderRequest</FormalSpec>
 <ReturnType>WS.AX.CHUI.dto.CreateAndNavigateToTemporaryOrderResponse</ReturnType>
 <Implementation><![CDATA[
-	Do ..OrderLevenCyclus.GenereerOrder(CANTORequest.CustomerNumber,CANTORequest.SalesIdAX)
-	Do ..TerminalNavigationService.RaadpleegOrder(CANTORequest.SalesIdAX,CANTORequest.ActiveDirectoryUserName,CANTORequest.WorkstationName )
-	Quit ##class(WS.AX.CHUI.dto.CreateAndNavigateToTemporaryOrderResponse).%New()
+	Set Response = ##class(WS.AX.CHUI.dto.CreateAndNavigateToTemporaryOrderResponse).%New()
+	Try{
+		Do ..OrderLevenCyclus.GenereerOrder(CANTORequest.CustomerNumber,CANTORequest.SalesIdAX)
+		Try{
+			Do ..TerminalNavigationService.RaadpleegOrder(CANTORequest.SalesIdAX,CANTORequest.ActiveDirectoryUserName,CANTORequest.WorkstationName )
+		} catch {
+			#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+			Set Response.Message = "Het order is gegenereerd, maar er is iets fout gegaan met het registreren van de Admin navigatie opdracht"
+		}		
+	} catch {
+		#dim OrdercreatieExceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Set Response.Message = OrdercreatieExceptie.GeefOmschrijving()
+	}
+	Quit Response
 ]]></Implementation>
 </Method>
 </Class>