ROBE-116 Fix exception handlers
ROBE-116 Fix string duplicates
Merge remote-tracking branch 'origin/master'
ROBE-116:Fix string duplicates