Improved Some Error Messages