diff --git a/src/data.py b/src/data.py
index 002e131..4b5e5b9 100644
--- a/src/data.py
+++ b/src/data.py
@@ -55,6 +55,9 @@ class Message():
         self.user = user
         self.guild = guild
         self.to_from = to_from
+        self.trade = None
+        if self.channel is Channel.WHISPER:
+            self.parse_trade()
 
     def __str__(self) -> str:
         text = f'{self.date} - {self.channel.name}: '
@@ -65,12 +68,13 @@ class Message():
         text = text + f'{self.user}: {self.message}'
         return text
 
-    def parse_trade(self) -> Trade:
+    def parse_trade(self) -> None:
         res = re_trade.search(self.message)
-        return Trade(item=res['item'],
-                     amount=int(res['amount']),
-                     currency=res['currency'],
-                     tab=res['tab'],
-                     row=int(res['row']),
-                     col=int(res['col']),
-                     league=res['league'])
+        if res:
+            self.trade = Trade(item=res['item'],
+                               amount=int(res['amount']),
+                               currency=res['currency'],
+                               tab=res['tab'],
+                               row=int(res['row']),
+                               col=int(res['col']),
+                               league=res['league'])
diff --git a/src/gui.py b/src/gui.py
index 31928ae..98aadf3 100644
--- a/src/gui.py
+++ b/src/gui.py
@@ -1,7 +1,8 @@
 from tkinter import ttk
 from tkinter import Tk
 from tkinter import Button
-from .data import Trade
+from .data import Message
+
 
 class Gui(Tk):
     def __init__(self, parent=None) -> None:
@@ -17,7 +18,7 @@ class Gui(Tk):
         self.add_tab(2, None)
         self.add_tab(3, None)
 
-    def add_tab(self, number: int, trade: Trade) -> None:
+    def add_tab(self, number: int, message: Message) -> None:
         tab = ttk.Frame(self.tab_control)
         Button(tab, text='Accept').pack()
         Button(tab, text='Decline').pack()
diff --git a/src/trader.py b/src/trader.py
index 9c8d9a9..3ac2dde 100644
--- a/src/trader.py
+++ b/src/trader.py
@@ -32,10 +32,8 @@ def read_log(logfile: str, app: gui.Gui) -> None:
     for line in loglines:
         message = parse_log(line)
         log.debug(message)
-        if message and message.channel is Channel.WHISPER:
-            log.info('TRADE')
-            trade = message.parse_trade()
-            app.add_tab(30, trade)
+        if message.trade:
+            app.add_tab(30, message)
 
 
 def follow(thefile: str):