Fixing issues surrounding no-connectivity cases, closes #165.