KRACOEUS-8482 and KRACOEUS-8587 verifying indicator fields before trying...

... to route
This reverts the debugging code I put in yesterday, and fixes the actual problem
No argument, pre-existing stuff though