hmm seems the nonNull check which I commented a few lines above is missing here... maybe missed while refactoring?