[PATCHv2 0/2] ch: minor fixes - segfault and last meaningful error preservation