Fix some Exceptions incompatibilities

Change-Id: I1f2387dc2655dee47a98cb507428a472b24c7a51
Merge "Fix some Exceptions incompatibilities"