The error message should have the correct function name -- preferably AFTER we decide (again?) what this function is called.