Throw a more informative exception on failure.

@bug W-2461532@

@rev kgray@
Merge branch 'goliver/master-pending-no-concurrent'