Made error messages more descriptive