Revert "Trying to debug that NPE"

This reverts commit 5336acdacf2dde26deacc0ab55fd27ae7ad82592.
We shouldn't even add portals with a null dest