Uncomment exceptions handling in the CLI