diff --git a/server/characters/character_manager.cpp b/server/characters/character_manager.cpp
index 53edc9c..c701be7 100644
--- a/server/characters/character_manager.cpp
+++ b/server/characters/character_manager.cpp
@@ -253,7 +253,7 @@ CharacterData* CharacterManager::Get(int uid) {
 		return nullptr;
 	}
 
-	return &it->second;
+	return &(it->second);
 }
 
 int CharacterManager::GetLoadedCount() {
diff --git a/server/rooms/room_manager.cpp b/server/rooms/room_manager.cpp
index d31a597..414c026 100644
--- a/server/rooms/room_manager.cpp
+++ b/server/rooms/room_manager.cpp
@@ -26,6 +26,9 @@
 #include <stdexcept>
 #include <sstream>
 
+//debug
+#include <iostream>
+
 //-------------------------
 //public access methods
 //-------------------------
@@ -43,6 +46,10 @@ int RoomManager::Create(std::string roomName, std::string tileset) {
 }
 
 void RoomManager::PushEntity(Entity* entity) {
+	if (!entity) {
+		throw(std::runtime_error("Failed to push null entity"));
+	}
+
 	std::map<int, RoomData>::iterator it = elementMap.find(entity->GetRoomIndex());
 
 	if (it == elementMap.end()) {
@@ -51,10 +58,16 @@ void RoomManager::PushEntity(Entity* entity) {
 		throw(std::runtime_error(msg.str()));
 	}
 
-	it->second.entityList.push_back(entity);
+	it->second.entityList.push_back(&(*entity));
+
+	std::cout << "\troom[" << it->first << "].entityList.size(): " << it->second.entityList.size() << std::endl;
 }
 
 void RoomManager::PopEntity(Entity* entity) {
+	if (!entity) {
+		throw(std::runtime_error("Failed to pop null entity"));
+	}
+
 	std::map<int, RoomData>::iterator it = elementMap.find(entity->GetRoomIndex());
 
 	if (it == elementMap.end()) {
@@ -64,8 +77,12 @@ void RoomManager::PopEntity(Entity* entity) {
 	}
 
 	it->second.entityList.remove_if([&](Entity* ptr) -> bool {
-		return ptr == entity;
+		bool b = &(*ptr) == &(*entity);
+		std::cout << "\tmatch(" << int(&(*ptr)) << "," << int(&(*entity)) << "): " << b << std::endl;
+		return b;
 	});
+
+	std::cout << "\troom[" << it->first << "].entityList.size(): " << it->second.entityList.size() << std::endl;
 }
 
 void RoomManager::UnloadAll() {
diff --git a/server/server_methods.cpp b/server/server_methods.cpp
index 1a97a68..bb147c2 100644
--- a/server/server_methods.cpp
+++ b/server/server_methods.cpp
@@ -149,6 +149,9 @@ void ServerApplication::FullCharacterUnload(int index) {
 			return false;
 		}
 
+		//pop from the rooms
+		roomMgr.PopEntity(&character.second);
+
 		//pump character unload
 		CharacterPacket newPacket;
 		newPacket.type = SerialPacketType::CHARACTER_DELETE;