Handle duplicates when logging errors
Merge commit 'fcb2d05'