make stopping and restarting possible
also catch real exceptions.
Merge remote-tracking branch 'origin/master'