Made error messages simpler and more dynamic