More correctness checking.

Signed-off-by: Xiongfei(Alex) Guo <xfguo@credosemi.com>