Adding verifications for fields.

Change-Id: I93a850ea8e12fdbeafc151604900de8d23d54e3f