Removed upload workbook / Added error handling