case 3726 - Gracefully handle provider errors.
Merge branch 'case-3726' into develop

* case-3726:
  case 3726 - Gracefully handle provider errors.