Fixed no error message warning
Merge branch 'develop'