added more error messages