In-line fault handling