Added extra error messages