Fix some NPE's in MachineArrayAdapter