Bug-fix: CLI wasn't allowing handlers to be set under some
circumstances.