More strict verification

Change-Id: I3773882499c6aa86c081682c76eaa9a6f9a956e1