Merge branch 'staticcat/f-Improve-Dropbox-Exceptions'
Adjusted message generation to be more informative