ddd40a0645
It lacks of some checks in unit test case. Therefore, I add them and make it completion. Change-Id: Id0d20158ae753d245a541fca5ac4fafeecc9790a