diff --git a/bot.py b/bot.py
index 56b9e93..0ff7782 100755
--- a/bot.py
+++ b/bot.py
@@ -30,17 +30,21 @@ def tweet(bot, update):
  update.message.reply_text("Ooops. Not implemented yet.")
 
 def toggleTweet(bot, update):
- update.message.reply_text(strings.toggleTweet % ("on" if dbtools.dbHelper().toggleTweet(update.message.chat_id) else "off")
+ try:
+  update.message.reply_text(strings.toggleTweet % ("on" if dbtools.dbHelper().toggleTweet(update.message.chat_id) else "off")
+ except:
+  update.message.reply_text(strings.noauth)
 
 def unknown(bot, update):
  update.message.reply_text("Sorry, I didn't understand that command.")
 
-updater.dispatcher.add_handler(telegram.ext.CommandHandler("start", start))
 updater.dispatcher.add_handler(telegram.ext.CommandHandler("auth", auth))
-updater.dispatcher.add_handler(telegram.ext.CommandHandler("unauth", unauth))
 updater.dispatcher.add_handler(telegram.ext.CommandHandler("fish", fish))
+updater.dispatcher.add_handler(telegram.ext.CommandHandler("help", start))
+updater.dispatcher.add_handler(telegram.ext.CommandHandler("start", start))
 updater.dispatcher.add_handler(telegram.ext.CommandHandler("toggletweet", toggleTweet))
 updater.dispatcher.add_handler(telegram.ext.CommandHandler("tweet", explicitTweet))
+updater.dispatcher.add_handler(telegram.ext.CommandHandler("unauth", unauth))
 
 updater.dispatcher.add_handler(telegram.ext.MessageHandler(telegram.ext.Filters.text, tweet))
 updater.dispatcher.add_handler(telegram.ext.MessageHandler(telegram.ext.Filters.command, unknown))
diff --git a/strings.py b/strings.py
index b5c42db..3de994b 100644
--- a/strings.py
+++ b/strings.py
@@ -1,5 +1,8 @@
 import setuptools
 
+noauth = '''You are not authenticated. Please use /auth to sign in with Twitter.'''
+
+
 start = '''Hey there!
 
 I'm @%s, everybody's favorite Twitter bot on Telegram!