Shayan/errors