Check error before showing error message
Merge branch 'Develop'