1016312: Improving content upload errors
Merge pull request #103 from daviddavis/temp/20131008164806

1016312: Improving content upload errors