WIP: add more exception info

Change-Id: I6b9471e8a89b9dcdd0c795c8db7b366b12ef2d47