Merge "Add object validity checking."