Check for existence of association before saving
File cleanup
Merge pull request #301 from ophrescue/279-duplicate-key

279 duplicate key