Fix NPE with Lightning
Tweak log decay check