Add extra check

Change-Id: If7d10f60d4067dd997df37fb0a1b8085956d36cd