Add extra check

Change-Id: Iab64be9277da8983345f31aa35a740f68d40cee8
Merge "Add extra check"