check/shortcircuit _RecordNote's results in case it fails

because the following _SetTold depends on the success of _RecordNote.
see also #20489 for an example to trigger this(not a good one though)
Merge branch '4.0/check-record-note-results-in-correspond' into 4.0-trunk