The NPE crash I was dealing with was occurring on the initial pull request you took from me. If you've come across this issue and have already fixed it, then that's good.
Otherwise I can try and recreate the issue in a simplified test case to see if it occurs and what the exact preconditions are.