AS7-6041 Do not add a scope to decorators
Merge pull request #245 from patriot1burke/master

exception handling to match spec
Fix NPE which accours if you call stop on a not started server
Merge pull request #244 from stuartwdouglas/master

AS7-6041 Do not add a scope to decorators
Merge pull request #247 from normanmaurer/master

Fix NPE which accours if you call stop on a not started server
Merge remote-tracking branch 'upstream/master'