Added fix for potential nullpointer exception

No match.