Don't raise expression for more data than expected

they have timestamps now plus the number of expected steps is
calculated in a wrong way.