Add additional check when retrieving thumbnails from the DSS.
Merge remote-tracking branch 'origin/devel'