ONERROR short-circuit (Issue #334)