diff --git a/src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsCommand.java b/src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsCommand.java
index 0a9cd82..b470cb9 100644
--- a/src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsCommand.java
+++ b/src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsCommand.java
@@ -804,4 +804,4 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
         return "";
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/sekwah/advancedportals/bukkit/listeners/PluginMessageReceiver.java b/src/main/java/com/sekwah/advancedportals/bukkit/listeners/PluginMessageReceiver.java
index 450b3b0..36c76d6 100644
--- a/src/main/java/com/sekwah/advancedportals/bukkit/listeners/PluginMessageReceiver.java
+++ b/src/main/java/com/sekwah/advancedportals/bukkit/listeners/PluginMessageReceiver.java
@@ -20,7 +20,6 @@ public class PluginMessageReceiver implements PluginMessageListener {
 
     @Override
     public void onPluginMessageReceived(String channel, Player player, byte[] message) {
-        // plugin.getLogger().info(""+channel.equals(plugin.channelName));
 
         if (!channel.equals(plugin.channelName)) {
             return;
@@ -29,22 +28,18 @@ public class PluginMessageReceiver implements PluginMessageListener {
         ByteArrayDataInput in = ByteStreams.newDataInput(message);
         String subchannel = in.readUTF();
 
-        // plugin.getLogger().info("bukkit plugin received: " + subchannel);
-
         if (subchannel.equals("BungeePortal")) {
             String targetPlayerUUID = in.readUTF();
             String targetDestination = in.readUTF();
 
-            OfflinePlayer msgPlayer = plugin.getServer().getOfflinePlayer(UUID.fromString(targetPlayerUUID));
+            Player msgPlayer = plugin.getServer().getPlayer(UUID.fromString(targetPlayerUUID));
 
-            Destination.warp(msgPlayer.getPlayer(), targetDestination);
-
-            /* plugin.PlayerDestiMap.put(msgPlayer, targetDestination);
-
-            plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, () ->
-                plugin.PlayerDestiMap.remove(msgPlayer),
-                20L*10
-            ); */
+            if (msgPlayer != null) {
+                plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin,
+                        () -> Destination.warp(msgPlayer, targetDestination),
+                        20L
+                );
+            }
         }
     }
 
diff --git a/src/main/java/com/sekwah/advancedportals/bungee/listener/PluginMessageReceiver.java b/src/main/java/com/sekwah/advancedportals/bungee/listener/PluginMessageReceiver.java
index a692471..749addd 100644
--- a/src/main/java/com/sekwah/advancedportals/bungee/listener/PluginMessageReceiver.java
+++ b/src/main/java/com/sekwah/advancedportals/bungee/listener/PluginMessageReceiver.java
@@ -20,15 +20,11 @@ public class PluginMessageReceiver implements Listener {
         ByteArrayDataInput in = ByteStreams.newDataInput(event.getData());
         String subChannel = in.readUTF();
 
-        plugin.getProxy().getLogger().info("bungee plugin received: " + subChannel);
-
         if (subChannel.equalsIgnoreCase("PortalEnter")) {
             String targetServer = in.readUTF();
             String targetPlayerUUID = in.readUTF();
             String targetDestination = in.readUTF();
 
-           //  plugin.getProxy().getLogger().info(targetServer + " " + targetPlayerUUID + " " + targetDestination);
-
             plugin.PlayerDestiMap.put(targetPlayerUUID, new String[]{targetServer, targetDestination});
 
             plugin.getProxy().getScheduler().schedule(plugin, () -> {