Fix null canary object#3433

a-b merged 2 commits intocloudfoundry:maincloudfoundry/cli:mainfrom

Samze:fix_canary_nullSamze/cli:fix_canary_nullCopy head branch name to clipboard