minor exception message changes