Better data checking for fee calculations