And log more in error cases.