Proposed patch for #2589 to guard against content spoofing.
Catch a specific exception
Update release notes for #2589
Fix one more missing exception
Merge pull request #1244 from wmswms/eight

Guard against content spoofing.

Fixes ticket:2589