Skip rethrow on client
Merge pull request #985 from ForbesLindesay/fix/runtime-rethrow

Skip rethrow on client