Reprocessing finished and improvements in exception handling