Perhaps you fell onto a block you thought was a water block but while falling you moved one block too far and died? That happened to me before, maybe it happened to you?
Not to sure on this one, but if you fall into water thats 1 block deep, dont you still take damage? This could be why you died.