another nullcheck (but this is confusing... no time to investigate that though)
scripted update of code from master at c9875f6 another nullcheck (but this is confusing... no time to investigate that though)