Fix bug introduced in prior commit

Prior commit would retry FETCH command for *any* Error, which is
incorrect.  It should only retry when RETRY is thrown, otherwise it
should re-throw the Error.
Merge branch 'master' into wip/only-incomplete