INT-2243 Polishing
INT-2243: fall-back to default on Eval Exception