Fixed application crash.
Merge branch 'master' of github.com:nearform/sync