XD-1996 UI: Tightening null checks