ECM-436B Evap pump 07 XC70

[erikv11]

Over the last few weeks 0ur 07 XC70 is throwing intermittent ECM-436B with CEL. Once it was accompanied by ECM-400C but I suspect that was random and unrelated:

ECM-436B Leakage detection unit - signal missing
ECM-400C Three-way catalytic converter (TWC) efficiency, bank 1 - signal too high

The ECM-436B keeps popping up after I rest the codes; the ECM-400C only showed up once.

So I am assuming I need to replace the EVAP pump as it will soon fail completely, or is there another way to interpret/test this code?

Initially I thought I would replace the J hose while I'm in there but now shying away from it, not sure how easy it is to access on the canister end and I don't want to break other EVAP hoses in the area. I ran the "quick-test of the fuel system" in VIDA and the car passed. Leakage was 0.22, the threshold for failure is 0.44, so maybe the J hose is holding up fine. The EVAP parts are all at 192k and counting ...