Added extra checks for odd market data.