diff --git a/ChangeLog b/ChangeLog
index 3ac6bb761..b963e8993 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
 	* Source/NSException.m: Use non-symbolic stack trace if symbols
 	are not available.
 	* Source/NSIndexSet.m: Add private method for minternal use.
+	* Source/NSMessagePort.m: Fix error releasing uninitialised instance.
 
 2007-01-30  Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Source/NSMessagePort.m b/Source/NSMessagePort.m
index 2faccb042..89c5f7eee 100644
--- a/Source/NSMessagePort.m
+++ b/Source/NSMessagePort.m
@@ -1701,7 +1701,10 @@ typedef	struct {
   M_LOCK(messagePortLock);
   if (NSDecrementExtraRefCountWasZero(self))
     {
-      NSMapRemove(messagePortMap, (void*)name);
+      if (_internal != 0)
+        {
+          NSMapRemove(messagePortMap, (void*)name);
+	}
       M_UNLOCK(messagePortLock);
       [self dealloc];
     }