diff --git a/src/mock/class_addressGenerator.py b/src/mock/class_addressGenerator.py
index d8ec802d..700da33f 100644
--- a/src/mock/class_addressGenerator.py
+++ b/src/mock/class_addressGenerator.py
@@ -66,8 +66,8 @@ class FakeAddressGenerator(StoppableThread):
     def stopThread(self):
         try:
             queues.addressGeneratorQueue.put(("stopThread", "data"))
-        except:  # noqa:E722
-            pass
+        except queue.Full:
+            self.logger.error('addressGeneratorQueue is Full')
         super(FakeAddressGenerator, self).stopThread()
 
     def run(self):
diff --git a/src/tests/test_process.py b/src/tests/test_process.py
index 0d7a02af..5cc9e07b 100644
--- a/src/tests/test_process.py
+++ b/src/tests/test_process.py
@@ -147,7 +147,7 @@ class TestProcessProto(unittest.TestCase):
                 "ps", "-L", "-o", "comm=", "--pid",
                 str(self.process.pid)
             ]).split()
-        except:  # noqa:E722
+        except subprocess.CalledProcessError:
             thread_names = []
 
         running_threads = len(thread_names)