| Index: testing_support/local_rietveld.py
 | 
| diff --git a/testing_support/local_rietveld.py b/testing_support/local_rietveld.py
 | 
| index d79eea8cf063af814f5ca31aac100f59e616e366..20aaa611e55e52457e40732154f1c58a65330d30 100755
 | 
| --- a/testing_support/local_rietveld.py
 | 
| +++ b/testing_support/local_rietveld.py
 | 
| @@ -139,7 +139,10 @@ class LocalRietveld(object):
 | 
|  
 | 
|    def stop_server(self):
 | 
|      if self.test_server:
 | 
| -      self.test_server.kill()
 | 
| +      try:
 | 
| +        self.test_server.kill()
 | 
| +      except OSError:
 | 
| +        pass
 | 
|        self.test_server.wait()
 | 
|        self.test_server = None
 | 
|        self.port = None
 | 
| 
 |