findbugs: null check for gateway and netmask instead of gateway twice
findbugs: remove compatible objects from collection
Revert "findbugs: remove compatible objects from collection"

This reverts commit 390325c50b4f401a0dd91fc3b6b0b03f21db0bbc.