CONN-1061 Added Null pointer check.