Fixed a NullPointerException in CommandManager. Removed completed TODO annotation.