#5965: Add Null validation to container code