Fixes #219: Addresses app crashes from dropbox conflicts due to merge errors

This small patch should resolve at least one occurrence of application crashing.