diff --git a/sys/apps/network/trust.lua b/sys/apps/network/trust.lua
index 7f80427..c31b6ec 100644
--- a/sys/apps/network/trust.lua
+++ b/sys/apps/network/trust.lua
@@ -13,10 +13,9 @@ local function trustConnection(socket)
 		if not password then
 			socket:write({ msg = 'No password has been set' })
 		else
-			pcall(function()
-				data = Crypto.decrypt(data, password)
-			end)
-			if data and data.pk and data.dh == socket.dhost then
+			local s
+			s, data = pcall(Crypto.decrypt, data, password)
+			if s and data and data.pk and data.dh == socket.dhost then
 				local trustList = Util.readTable('usr/.known_hosts') or { }
 				trustList[data.dh] = data.pk
 				Util.writeTable('usr/.known_hosts', trustList)
diff --git a/sys/modules/opus/socket.lua b/sys/modules/opus/socket.lua
index 0ff53a9..8151855 100644
--- a/sys/modules/opus/socket.lua
+++ b/sys/modules/opus/socket.lua
@@ -210,7 +210,6 @@ function Socket.server(port, options)
 		local _, _, sport, dport, msg = os.pullEvent('modem_message')
 
 		if sport == port and
-			 msg and
 			 type(msg) == 'table' and
 			 msg.dhost == os.getComputerID() and
 			 msg.type == 'OPEN' then