#2061 use more descriptive and accurate message