Be more conditional in what exception we're catching
Merge branch 'mbs-7447' into beta

* mbs-7447:
  Be more conditional in what exception we're catching