rolled back error messages changes b/c they were unecessary