Cli update

Added null checks for .console and changed some to .out when possible.