Ah, I missed the nil check here too, I'll add it in a sec