Add except for issue #392
Merge branch 'hotfix/issue392'