Small fixes to error handling.
Merge branch 'master' of github.com:logancollins/SyncKit