Made error messages more helpful