Added a protection for possible null pointers
Merge pull request #3157 from venturia/fedconnection_protection-71x

Added a protection for possible null pointers