Moved network null fix to Janeway module, so it will only need to be in one place