Further changes to handle tombstoned files

[bguscott]

Added an additional change to prevent empty file values due to tombstones causing the program to crash.

[pR0Ps]

Thanks for pointing this case out, I hadn't come across it in my testing. I've fixed the issue in a different way in f50e11c1