Catch Step_limit_reached consistently with Timeout

[bclement-ocp]

This is a partial fix for #1244 that only addresses the fatal error issue, but not incrementality.