(no ticket) Cleaned up exceptions

Change-Id: I2443512835ba4b554baa9819444e5403fab6d003
Merge "(no ticket) Cleaned up exceptions"