Bug 58053 - catch Exception *as*

Change-Id: I4401bd6a4463b8c8cc2f127b34165c984c3a95cb
Merge "Bug 58053 - catch Exception *as*"