fixed error handling, removed unnecessary logs

Merged Vivek Naik requested to merge reorg_error_handling into devbranch
  1. Jun 06, 2020