Fixed some error messages to be nicer