diff --git a/python-api/gstswitch/server.py b/python-api/gstswitch/server.py
index ee20215..2f2d15e 100644
--- a/python-api/gstswitch/server.py
+++ b/python-api/gstswitch/server.py
@@ -27,6 +27,8 @@ def __init__(self, path, video_port=3000, audio_port=4000, control_port=5000, re
         self.audio_port = audio_port
         self.control_port = control_port
         self.record_file = record_file
+        self.proc = None
+        self.pid = -1
 
     def run(self, gst_option=''):
         """Launches the server process
@@ -36,8 +38,7 @@ def run(self, gst_option=''):
         Should be added with spaces between them
         :returns: nothing
         """
-        self.proc = None
-        self.pid = -1
+        
         self.gst_option_string = gst_option
         print "Starting server"
         self.proc = self._run_process()
diff --git a/python-api/gstswitch/test_server.py b/python-api/gstswitch/test_server.py
index c978542..33186c8 100644
--- a/python-api/gstswitch/test_server.py
+++ b/python-api/gstswitch/test_server.py
@@ -17,3 +17,12 @@ def test_normal(self):
         s.run()
         assert s.proc is not None
         s.terminate()
+
+    def test_terminate(self):
+        path = '/home/hyades/gst/master/gstreamer/tools/'
+        s = Server(path=path)
+        with pytest.raises(ServerProcessError):
+            s.terminate()
+
+    # def test_kill(self):
+    #     pass