Fixed message
Merge branch 'fix-mainerror' into develop