Fixup! Actually, exception needs evaluation to be finished too.

Squash pre-merge.