re #7910 improve error handling
Merge branch 'feature/7910_dragdrop_files' into develop