Preserving original call in rtchecks to improve messages