Update chronograph error handling

procedure!964 (merged)