issue #673 error is displayed now
Merge branch 'hotfixes' into develop