Add user friendly error messages