holoirc: try to fix some NPE errors