#5965: Add Null validation to container code
Merge pull request #6174 from dotCMS/issue-5965-container-code

#5965: Add Null validation to container code