Matej Novotny, I can confirm that with the latest changes the NPE is no longer occuring in my case - great work, thank you!