Error Message fix
Merge branch 'ErrorMessageFix'