Added more error controls
changet stage: report -> cleanup