moar exceptions

Change-Id: I0294d4e4d8e7efbe64b57c5657cc2b397930bab2