I think enhancing the code in such a way would support poor database naming conventions... I'm all for leaving it to break under those conditions.