Strengthen error messages