Merge "Updating the try/except blocks to assertRaises."