diff --git a/grab_samples.py b/grab_samples.py
index 3cf6886..3951e61 100644
--- a/grab_samples.py
+++ b/grab_samples.py
@@ -24,7 +24,7 @@ def cleanup(msg):
       msg = msg.replace(unwanted, '')
 
     return msg
-  except:
+  except TypeError:
     return msg
 
 
diff --git a/main.py b/main.py
index 3acb041..71d0025 100644
--- a/main.py
+++ b/main.py
@@ -24,7 +24,7 @@ message = ''
 for i in range(5):
   try:
     message = message + text_model.make_sentence()
-  except:
+  except TypeError:
     pass
 
 if (dry_run):