2010-05-01 cli Refactor logging to fix NullPointerException.