Improve content errors and fix access violation
Merge pull request #740 from tambry/ErrorDialogFix

Improve content errors and fix access violation