> I think you need to check for them being non-empty as well

Good point.
If you have done that, may you share the patch?

Daanturo