Merge change Id5ccf4bc

* changes:
  Catch bad getStackTrace() calls.