Fixed broken exception code

Change-Id: Id399cb22f183d75acc006e698feb161bd12096bd
Merge "Fixed broken exception code"