Shouldn't this be retained? Otherwise no wrapping would occur and we just return exception as is?