[SC] Addendum to 4728157: Add missed values to query errors and usage output. (#387)