Adding verifications for fields.

Change-Id: If949f362d8752d29d4efe926c9e3614d2168ec57