diff --git a/Spectrum2/backend.py b/Spectrum2/backend.py
index 4504bb1..5a91a27 100644
--- a/Spectrum2/backend.py
+++ b/Spectrum2/backend.py
@@ -262,7 +262,6 @@ class SpectrumBackend:
 
 	def handleConvMessagePayload(self, data):
 		payload = protocol_pb2.ConversationMessage()
-		self.logger.error("handleConvMessagePayload")
 		if (payload.ParseFromString(data) == False):
 			#TODO: ERROR
 			return
diff --git a/session.py b/session.py
index 510b97b..b5706d9 100644
--- a/session.py
+++ b/session.py
@@ -434,10 +434,12 @@ class Session(YowsupApp):
 	def onPresenceReceived(self, _type, name, jid, lastseen):
 		self.logger.info("Presence received: %s %s %s %s", _type, name, jid, lastseen)
 		buddy = jid.split("@")[0]
-                try:
-                        buddy = self.buddies[buddy]
+		try:
+			buddy = self.buddies[buddy]
 		except KeyError:
-                        self.logger.error("Buddy not found: %s", buddy)
+			# Sometimes whatsapp send our own presence
+			if buddy != self.legacyName:
+				self.logger.error("Buddy not found: %s", buddy)
 			return
 
 		if (lastseen == str(buddy.lastseen)) and (_type == buddy.presence):
diff --git a/transwhat.py b/transwhat.py
index 935b185..776b1cc 100755
--- a/transwhat.py
+++ b/transwhat.py
@@ -62,7 +62,13 @@ logging.basicConfig( \
 
 # Handler
 def handleTransportData(data):
-	plugin.handleDataRead(data)
+	try:
+		plugin.handleDataRead(data)
+	except SystemExit as e:
+		raise e
+	except:
+		logger = logging.getLogger('transwhat')
+		logger.error(traceback.format_exc())
 
 e4u.load()