Check error_message already exists
Add attributes to model
Merge branch 'release/25July2013b'