Fix exception handling and provider exceptions.

(take 2 - flapper prevented take 1)

@bug W-1974505@

@rev eric.anderson@
Merging origin/goliver/master-pending-fix-provider-take-2 into master