Plfm 2678 - handle null values correctly