Stop server when something unexpected happens
Merge branch 'tt-stop-fix'