bug 927 fixes - consistent error messages