diff --git a/httptools/twitter.py b/httptools/twitter.py
index 1bcffed..5c08e89 100755
--- a/httptools/twitter.py
+++ b/httptools/twitter.py
@@ -7,7 +7,7 @@ arg = "w"
 def check(site, recipient, two = twitools.twObject()):
  status = httptools.getStatus(site)
  if not status == 200:
-  if status == None:
+  if not status:
    two.tweet("@%s Site %s looks down from here!" % (recipient, site))
   else:
    two.tweet("@%s Site %s returns status code %s!" % (recipient, site, status))
diff --git a/twitter.py b/twitter.py
index b2bd548..3cc0df0 100755
--- a/twitter.py
+++ b/twitter.py
@@ -8,7 +8,7 @@ for mod in setuptools.getListSetting("KumiStatus", "modules"):
  try:
   name = mod + ".twitter"
   temp = importlib.import_module(name)
-  p.add_argument("--" + mod, "-" + temp.arg, action="store_const", const=temp)
+  p.add_argument("--" + mod[:-5], "-" + temp.arg, action="store_const", const=temp)
  except Exception as e:
   print(e)