(#1414) - change error name
merge from 1414