Bug 69: Fixes network null-error. Fixes issue #3.