diff --git a/source/ChunkSender.cpp b/source/ChunkSender.cpp
index 47d84d166..3a664962d 100644
--- a/source/ChunkSender.cpp
+++ b/source/ChunkSender.cpp
@@ -186,7 +186,11 @@ void cChunkSender::BlockData(const char * a_Data)
 
 void cChunkSender::BlockEntity(cBlockEntity * a_Entity)
 {
-	m_Packets.push_back(a_Entity->GetPacket());
+	cPacket * Packet = a_Entity->GetPacket();
+	if (Packet != NULL)
+	{
+		m_Packets.push_back(Packet);
+	}
 }