Null activeCommands list fix