holoirc: some more NPE fixes