correct exception

Change-Id: I266f09c7bb5174f4ee1ff37a62c6cc1584e07aa4
Merge "correct exception" into R1.06