Minor error message improvements