Fix error message
Merge branch 'fix/server-stop' into dev