Fixed one thign and added custom error messages