Removed call of FINISH after error