Content Uploads: Checking for exceptions and other tweaks