Added user friendly error messages