Fix errors with finishExpression

Authored by sirgienko on Mar 3 2019, 1:49 PM.