diff --git a/IRCLineHandler.py b/IRCLineHandler.py
index b36e6ac4..10afcca9 100644
--- a/IRCLineHandler.py
+++ b/IRCLineHandler.py
@@ -200,10 +200,11 @@ def handle_QUIT(data):
 
 @handler(description="The server is telling us about its capabilities!")
 def handle_CAP(data):
+    capibility_list = []
     if len(data.args) > 2:
         capability_list = data.args[2].split()
-        bot.events.on("received").on("cap").call(data=data,
-            subcommand=data.args[1], capabilities=capability_list)
+    bot.events.on("received").on("cap").call(data=data,
+        subcommand=data.args[1], capabilities=capability_list)
 
 @handler(description="The server is asking for authentication")
 def handle_AUTHENTICATE(data):
diff --git a/IRCServer.py b/IRCServer.py
index e6f1919d..44ffb89c 100644
--- a/IRCServer.py
+++ b/IRCServer.py
@@ -45,6 +45,7 @@ class Server(object):
             context = ssl.SSLContext(OUR_TLS_PROTOCOL)
             context.options |= ssl.OP_NO_SSLv2
             context.options |= ssl.OP_NO_SSLv3
+            context.options |= ssl.OP_NO_TLSv1
             self.socket = context.wrap_socket(self.socket)
         self.cached_fileno = self.socket.fileno()
         self.bot.events.on("timer").on("rejoin").hook(self.try_rejoin)