Add more error
Merge branch 'MH-1008' into dev