Yes, there are quite similar pieces of code but I think we should get it right first and with your issue above this lines may change as a check for stale log could be added. And I don't mind of some refactoring of course