Fixes #5413 - Fix content view removal error message
Merge pull request #3999 from daviddavis/temp/20140423115449

Fixes #5413 - Fix content view removal error message