KRACOEUS-7289: Fixing protocol routing issues. Mostly null pointers and ...

...persistence issues.