diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs
index 597375cd9a..fc4a53b238 100644
--- a/OpenSim/Framework/PacketPool.cs
+++ b/OpenSim/Framework/PacketPool.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Framework
lock (pool)
{
- if (pool[type] == null || (pool[type]).Count == 0)
+ if (!pool.ContainsKey(type) || pool[type] == null || (pool[type]).Count == 0)
{
// Creating a new packet if we cannot reuse an old package
packet = Packet.BuildPacket(type);
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index d64e0a4bdc..4abc0f7100 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
///
///
///
- ///
+ ///
///
///
public void Initialise(