Fixed error messages to fit spec