Fix Null pointer handling for better Cli messages