adding in extra checks

Change-Id: I04aff7bfe0e66bc7db3978be22e54f5cf6d3916d
Merge "adding in extra checks" into production