Fix cleanup error not executing
Add a few more logs