Content Uploads: Checking for exceptions and other tweaks
Merge pull request #81 from daviddavis/temp/20130912111700

Content Uploads: Checking for exceptions and other tweaks