Resolves #417 by checking for null ContentItem before returning View.