Fix NPE, add command messages