Index: WS/Prod/OptiBox/OptiServer.cls.xml
===================================================================
diff -u -r31228 -r31337
--- WS/Prod/OptiBox/OptiServer.cls.xml	(.../OptiServer.cls.xml)	(revision 31228)
+++ WS/Prod/OptiBox/OptiServer.cls.xml	(.../OptiServer.cls.xml)	(revision 31337)
@@ -689,26 +689,22 @@
 	
 	$$$CheckAccess($$$rsPPSTBXOptiBox,$$$prRead)
 
-
-	If ..IsOudeWijzeVanVerwerkingFromCategorie(##class(APPS.Halux.common.enu.Categorie).Tandembox(),Werkpost)
-	{
-
-		Set WPClassName=##class(BL.PPS.TBX.OptiBox).GetWPClassName(Werkpost)
-		Set:(WPClassName="") pxStatus=$$$pxStatusErrorEx("Onbekende werkpost (GetWPBatchIDsViaWerkpost).",Werkpost)
-		If $$$pxStatusIsOK(pxStatus)
-		{
-			#dim QueryName as %String=WPClassName_":BatchIDList"
-			Set pxStatus=##class(BL.Sys.Proxy.pxXMLDataSet).CreateQuery(.varDataSet,QueryName)
+	If ..IsOudeWijzeVanVerwerkingFromCategorie(##class(APPS.Halux.common.enu.Categorie).Tandembox(),Werkpost) {
+		Set WPClassName = ##class(BL.PPS.TBX.OptiBox).GetWPClassName(Werkpost)
+		If $Length(WPClassName)	{
+			Set pxStatus = ##class(BL.Sys.Proxy.pxXMLDataSet).CreateQuery(.varDataSet,WPClassName_":BatchIDList")
+		} Else { 
+			Set pxStatus = $$$pxStatusErrorEx("Onbekende werkpost (GetWPBatchIDsViaWerkpost)"_ Werkpost,Werkpost)
 		}
-	}
-	Else  ; Nieuwe verwerking
-	{
-		#dim WerkpostImpl As APPS.Halux.PPS.Verpakking.KartonWerkpost = ..GeefWerkpostImpl(Werkpost)
-		If (WerkpostImpl = "") {
-			Set pxStatus = $$$pxStatusErrorEx("Onbekende werkpost (GetWPBatchIDsViaWerkpost)" _ Werkpost, Werkpost)
-		} Else {
+	} Else {
+		Try {
+			#dim WerkpostImpl As APPS.Halux.PPS.Verpakking.KartonWerkpost = ..GeefWerkpostImpl(Werkpost)
 			Set pxStatus = WerkpostImpl.GeefBatchIDLijst(.varDataSet)
+		} Catch {
+			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch(##class(TECH.enu.ExceptionCode).InvalidInput())
+			Set pxStatus = $$$pxStatusErrorEx("Onbekende werkpost (GetWPBatchIDsViaWerkpost)" _ Werkpost, Werkpost)
 		}
+		
 	}
 	Quit pxStatus
 ]]></Implementation>