error message fix
Merge branch 'sj-bugs'