Added fix for potential nullpointerexception

No match.