Everything freezes when I2C device loses power

[Combinacijus]

As mentioned here:
https://arduino.stackexchange.com/questions/30353/i2c-connection-freezes-master-if-slave-disconnects

It looks like the problem is that code gets into infinite loop. So I narrowed down problem to twi.cpp:
libraries/Wire/utility/twi.cpp

In twi.cpp I have commented out all while and do while loops and after that code don't freeze anymore so it must be problem in those loops BUT code doesn't work because those loops delay code execution until required processes finishes.

Proposed solution:
In twi.cpp file add timeout to all while and do while loops (assuming all loops are causing the problem)