Merge "change teardown check to LOG.error"