If that's the case then the current PSM effect implementation was broken to begin with; I got crashes without those null checks. I don't know why the collections were null in the first place.