Fixed NPE and added command