NPE fix for CommandMachine when dev staff is null