Help the cherry-pick for TRQ-2373. Make the error message accurate.