Return the original error from Marshal/Unmarshal instead