another nullcheck (but this is confusing... no time to investigate that though)