Evaluation finish - without exception throwing

Update #1 added comments