Exit on network change (to avoid sending data on 3G), and fix another NullReferenceException on the server.
Merge branch 'TESTING_PREPARATION'