Exception handling

Change-Id: I5ec16292b3de7f3fa04d465742a04bf5af5ab328
Signed-off-by: Matthias Steiner <matthias.steiner@inscope.net>