The factory must return a result or else there is a error
Merge branch 'hotfix/929'

Close #929