Update exeption handlers.

Change-Id: Ief59b86e2951996b52c0a4f6070d6eb84919553e
Merge "Update exeption handlers." into release-0.1