this also fixes an a11y exit on unhandled exception that's troubling
one of jluths private documents

Change-Id: I68207434d70e952b2c3439a3672e8df2439a4e78