Made error messages more informative