Propertly detect cleanup errors as errors (#130)