Add except for xmlrpc error
Merge branch 'hotfix/issue375'
Merge tag 'issue375' into develop

Correct issue #375