diff --git a/asyncoperations.lua b/asyncoperations.lua
index f2dd79a..9bf2550 100644
--- a/asyncoperations.lua
+++ b/asyncoperations.lua
@@ -7,11 +7,7 @@ local meta = _META
 function meta:send(fmt, ...)
 	local bytes, err = self.socket:send(fmt:format(...) .. "\r\n")
 
-	if bytes then
-		return
-	end
-
-	if err ~= "timeout" and err ~= "wantwrite" then
+	if not bytes and err ~= "timeout" and err ~= "wantwrite" then
 		self:invoke("OnDisconnect", err, true)
 		self:shutdown()
 		error(err, errlevel)
@@ -27,14 +23,12 @@ local function verify(str, errLevel)
 end
 
 function meta:sendChat(target, msg)
-	-- Split the message into segments if it includes newlines.
 	for line in msg:gmatch("([^\r\n]+)") do
 		self:send("PRIVMSG %s :%s", verify(target, 3), msg)
 	end
 end
 
 function meta:sendNotice(target, msg)
-	-- Split the message into segments if it includes newlines.
 	for line in msg:gmatch("([^\r\n]+)") do
 		self:send("NOTICE %s :%s", verify(target, 3), msg)
 	end
@@ -73,12 +67,12 @@ function meta:setMode(t)
 	assert(add or rem, "table contains neither 'add' nor 'remove'")
 
 	if add then
-		mode = table.concat{"+", add}
+		mode = table.concat{"+", verify(add, 3)}
 	end
 
 	if rem then
-		mode = table.concat{mode, "-", rem}
+		mode = table.concat{mode, "-", verify(rem, 3)}
 	end
 
-	self:send("MODE %s %s", verify(target, 3), verify(mode, 3))
+	self:send("MODE %s %s", verify(target, 3), mode)
 end
diff --git a/init.lua b/init.lua
index bb23ab5..ca18f95 100644
--- a/init.lua
+++ b/init.lua
@@ -103,13 +103,13 @@ function meta_preconnect:connect(_host, _port)
 		if type(secure) == "table" then
 			params = secure
 		else
-			params = {mode="client", protocol="tlsv1"}
+			params = {mode = "client", protocol = "tlsv1"}
 		end
 
 		s = ssl.wrap(s, params)
 		success, errmsg = s:dohandshake()
 		if not success then
-			error(("could not make secure connection %s"):format(errmsg), 2)
+			error(("could not make secure connection: %s"):format(errmsg), 2)
 		end
 	end
 
@@ -133,7 +133,7 @@ function meta_preconnect:connect(_host, _port)
 end
 
 function meta:disconnect(message)
-	local message = message or "Bye!"
+	message = message or "Bye!"
 
 	self:invoke("OnDisconnect", message, false)
 	self:send("QUIT :%s", message)