fix a typo

Change-Id: Icb20a40d1d88830421c888b7784033697a6d7bb7
add missing exception classes

Change-Id: I9522bc81ffcc568821d74aa675ebe7abacfca7c8
Closes-Bug: #1259201