retry functionality fix (do not re-wrap CommandExceptions)