Fix a possible null ref if the servers failed to communicate with each other.
Fixes for optional modules.
Fix a parcel issue reported by Sam.