fixed modality of ErrorHandler dialog
improved modality of ErrorHandler dialog
Merge branch 'next' into beta