Correct errors and do not leave stale dirs around
Cleanup environment even here if nothing to do