More fixes to the last NPE problem