more removal of pushy exceptions in cli.py

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>