Properly clean an exception to prevent a crash

Bug: 6404408
Change-Id: Id9a6e1ff303076da24f0221d3bc905ba0710f07e
1 file changed