fix other exceptions

Signed-off-by: Emmanuel Mathot <emmanuel.mathot@gmail.com>
ready to pack 1.8.3

Signed-off-by: Emmanuel Mathot <emmanuel.mathot@gmail.com>
Merge branch 'hotfix/excp'
Merge branch 'master' into develop