*Commands: Fixed NullPointerException