diff --git a/src/EuphApi/Bot.hs b/src/EuphApi/Bot.hs
index d040abf..5084d7b 100644
--- a/src/EuphApi/Bot.hs
+++ b/src/EuphApi/Bot.hs
@@ -96,8 +96,7 @@ module EuphApi.Bot (
   , BotException(..)
   ) where
 
--- TODO: Move 'PasswordNeeded' to 'ExitState'?
--- TODO: Add 'WrongPassword' exception or 'ExitState'.
+-- TODO: Add 'AuthenticationFailed' exception.
 
 import           Control.Concurrent
 import           Control.Exception
@@ -122,8 +121,8 @@ infoM      :: String -> IO ()
 infoM      = L.infoM moduleName
 noticeM    :: String -> IO ()
 noticeM    = L.noticeM moduleName
-warningM   :: String -> IO ()
-warningM   = L.warningM moduleName
+--warningM   :: String -> IO ()
+--warningM   = L.warningM moduleName
 --errorM     :: String -> IO ()
 --errorM     = L.errorM moduleName
 --criticalM  :: String -> IO ()
@@ -135,7 +134,6 @@ warningM   = L.warningM moduleName
 
 data ExitState = Stopping
                | Restarting
-               | OutOfRetries
 
 data BotState b c = BotState
   { bAddress           :: TVar String
@@ -279,7 +277,6 @@ runBot ioConfig = do
   result <- runBotOnce config
   case result of
     Stopping     -> void $ noticeM "Bot has stopped."
-    OutOfRetries -> void $ warningM "Bot ran out of retries."
     Restarting   -> noticeM "Bot has restarted." >> runBot ioConfig
 
 reconnect :: Integer -> Bot b c ExitState
@@ -290,7 +287,7 @@ reconnect retries = do
     Just s  -> return s
     Nothing ->
       case bReconnectPolicy state retries of
-        Nothing    -> return OutOfRetries
+        Nothing    -> liftIO $ throwIO OutOfRetries
         Just delay -> do
           liftIO $ infoM $ "Attempting reconnect in " ++ show (delay `div` 1000000)
                            ++ "s (" ++ show delay ++ "µs)."
@@ -462,10 +459,14 @@ data BotException = NoOwnViewYet
                     -- valid methods of authentication (password).
                     -- As long as the server is working properly, this exception should
                     -- not occur.
+                  | OutOfRetries
+                    -- ^ The bot's 'reconnectPolicy' has returned a @Nothing@ value,
+                    -- meaning that the bot should not attempt to reconnect any further.
 
 instance Show BotException where
   show NoOwnViewYet                 = "Bot hasn't received a SessionView of itself yet."
   show PasswordNeeded               = "Bot needs to authenticate, but has no password."
   show NoValidAuthenticationMethods = "Server gave no valid authentication methods."
+  show OutOfRetries                 = "Bot has ran out of reconnect retries."
 
 instance Exception BotException
diff --git a/src/EuphApi/Utils/Botrulez.hs b/src/EuphApi/Utils/Botrulez.hs
index 35c5b1e..0b338cb 100644
--- a/src/EuphApi/Utils/Botrulez.hs
+++ b/src/EuphApi/Utils/Botrulez.hs
@@ -91,13 +91,22 @@ killCommand t = E.specificCommand "kill" $ \msg -> do
   void $ B.reply (E.msgID msg) t
   B.stop
 
+-- | Version of 'killCommand' where the bot does not reply to the message which kills it.
 killCommandSilent :: E.Command b c
 killCommandSilent = E.specificCommand "kill" $ const B.stop
 
+-- | Specific restart command: @!restart \@botname@
+--
+-- When restarted, the bot receiving the command should be !killed and a
+-- new instance of the same bot should be started.
+--
+-- Bots __may implement__ this command.
 restartCommand :: T.Text -> E.Command b c
 restartCommand t = E.specificCommand "restart" $ \msg -> do
   void $ B.reply (E.msgID msg) t
   B.restart
 
+-- | Version of 'restartCommand' where the bot does not reply to the message
+-- which restarts it.
 restartCommandSilent :: E.Command b c
 restartCommandSilent = E.specificCommand "restart" $ const B.restart