only stop on certain conditions
Merge pull request #13 from MediaBrowser/master

only stop on certain conditions