Updated Stop() so that a panic isn't thrown, and updated test.