diff --git a/markov/simple.py b/markov/simple.py
index d0e89b8..436d906 100644
--- a/markov/simple.py
+++ b/markov/simple.py
@@ -58,7 +58,7 @@ def get(text):
                 current_word = random_weighted_word
                 sentence.append(current_word)
             except:
-                pass
+                break
         sentence[0] = sentence[0].capitalize()
         return ' '.join(sentence) + '.'
         return sentence
@@ -85,6 +85,6 @@ def get(text):
     text_list = text.split()
     model = make_markov_model(text_list)
 
-    generated = generate_random_sentence(30, model)
+    generated = generate_random_sentence(random.randint(5,30), model)
     generated = generated.replace(' END', '.')
     return generated
diff --git a/worker.py b/worker.py
index ee0896d..aed9a78 100755
--- a/worker.py
+++ b/worker.py
@@ -195,7 +195,7 @@ class MessageWorker:
                 if count > max_sen:
                     count = max_sen
             except:
-                count = 30
+                count = 5
             for i in range(0, count):
                 rand_messages.append(self.db.get_random_message())
             rand_text = " ".join(rand_messages)