Fixed #226 - Eliminates ordering issues in the SyncMessage protocol

And if it's not, what then?  We just hang forever?  What should happen in the else case?