walls: Make walls more fault tolerant.