1 files changed, 14 insertions, 10 deletions
diff --git a/lib/irc/connection.ex b/lib/irc/connection.ex
index fafb0d7..eae5362 100644
--- a/lib/irc/connection.ex
+++ b/lib/irc/connection.ex
@@ -189,7 +189,7 @@ defmodule IRC.Connection do
     Logger.metadata(conn: conn.id)
     backoff = :backoff.init(@min_backoff, @max_backoff)
               |> :backoff.type(:jitter)
-    {:ok, %{client: nil, backoff: backoff, conn: conn, connected_server: nil, connected_port: nil, network: nil}, {:continue, :connect}}
+    {:ok, %{client: nil, backoff: backoff, conn: conn, connected_server: nil, connected_port: nil, network: conn.network}, {:continue, :connect}}
   end
 
   @triggers %{
@@ -263,7 +263,7 @@ defmodule IRC.Connection do
   end
 
   # ISUP
-  def handle_info({:isup, network}, state) do
+  def handle_info({:isup, network}, state) when is_binary(network) do
     IRC.UserTrack.clear_network(state.network)
     if network != state.network do
       Logger.warn("Possibly misconfigured network: #{network} != #{state.network}")
@@ -280,15 +280,19 @@ defmodule IRC.Connection do
   # Received something in a channel
   def handle_info({:received, text, sender, chan}, state) do
     user = IRC.UserTrack.find_by_nick(state.network, sender.nick)
-    if !Map.get(user.options, :puppet) do
-      reply_fun = fn(text) -> irc_reply(state, {chan, sender}, text) end
-      account = IRC.Account.lookup(sender)
-      message = %IRC.Message{at: NaiveDateTime.utc_now(), text: text, network: state.network, account: account, sender: sender, channel: chan, replyfun: reply_fun, trigger: extract_trigger(text)}
-      message = case IRC.UserTrack.messaged(message) do
-        :ok -> message
-        {:ok, message} -> message
+    if !user do
+      Logger.error("Could not lookup user for message: #{inspect {state.network, sender.nick}}")
+    else
+      if !Map.get(user.options, :puppet) do
+        reply_fun = fn(text) -> irc_reply(state, {chan, sender}, text) end
+        account = IRC.Account.lookup(sender)
+        message = %IRC.Message{at: NaiveDateTime.utc_now(), text: text, network: state.network, account: account, sender: sender, channel: chan, replyfun: reply_fun, trigger: extract_trigger(text)}
+        message = case IRC.UserTrack.messaged(message) do
+          :ok -> message
+          {:ok, message} -> message
+        end
+        publish(message, ["#{message.network}/#{chan}:messages"])
       end
-      publish(message, ["#{message.network}/#{chan}:messages"])
     end
     {:noreply, state}
   end