diff --git a/src/services/galaxy/ConnectionService.java b/src/services/galaxy/ConnectionService.java
index f28419c14..42b0c93e1 100644
--- a/src/services/galaxy/ConnectionService.java
+++ b/src/services/galaxy/ConnectionService.java
@@ -33,11 +33,9 @@ public class ConnectionService extends Service {
 					for (Player p : zonedInPlayers) {
 						if (p.getTimeSinceLastPacket() > DISAPPEAR_THRESHOLD) {
 							p.setPlayerState(PlayerState.DISCONNECTED);
-							System.out.println(p.getCreatureObject().getName() + " has disappeared");
 							new PlayerEventIntent(p, PlayerEvent.PE_DISAPPEAR).broadcast();
 						} else if (p.getTimeSinceLastPacket() > LD_THRESHOLD) {
 							p.setPlayerState(PlayerState.LOGGED_OUT);
-							System.out.println(p.getCreatureObject().getName() + " has logged out");
 						}
 					}
 				}
@@ -89,7 +87,8 @@ public class ConnectionService extends Service {
 			if (((GalacticPacketIntent)i).getPacket() instanceof HeartBeatMessage) {
 				GalacticPacketIntent gpi = (GalacticPacketIntent) i;
 				Player p = gpi.getPlayerManager().getPlayerFromNetworkId(gpi.getNetworkId());
-				p.sendPacket(gpi.getPacket());
+				if (p != null)
+					p.sendPacket(gpi.getPacket());
 			}
 		}
 	}