[PATCH 2/2] ch: preserve last error before stop fix