Issue #160: Fixed freeform network NPE