Content Uploads: Adding indexing and error checking
Merge pull request #3004 from daviddavis/temp/20130919095933

Content Uploads: Adding indexing and error checking