Merge "Fix system crash on p2p failure"