Small cleanup that unifies duplicated code used in both the
error and success cases
Signed-off-by: NBoaz Harrosh <bharrosh@panasas.com>