*Commands.java fixed NullPointerException