tweak CaughtException

Change-Id: If5aac87876b139bfb394ec124136de131c3518ae