Fix regression recovering after errors