Fixed another possible NPE introduced in rev. 98ae55f0c00c2140fd805131f422d90feeebd978