Have Extend cope with offline network connections

Fixes #2116
Not needed anymore, right?