Trying to address Brian's comments about error messages

Error message fixing