diff --git a/ChangeLog b/ChangeLog
index c942148a..2167bb40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2004-05-29 08:56 Gregory John Casamento <greg_casamento@yahoo.com>
+2004-05-29 23:10 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Gorm.m: [Gorm testInterface:] removed conditional.  The services
+	menu is always set to nil when testing. [Gorm endTesting:] added
+	a NS_DURING block to catch any issues with resetting the services menu.
+	This prevents Gorm from crashing, if there's a problem.  Since the 
+	menu is set to nil and then reset there shouldn't be an issue.
+	
+2004-05-29 16:00 Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* GormDocument.m: [GormDocument attachObject:] added code
 	to automatically mark a menu being attached as the 
diff --git a/Gorm.m b/Gorm.m
index 4df49504..cd4b58c2 100644
--- a/Gorm.m
+++ b/Gorm.m
@@ -757,11 +757,8 @@ NSString *GormResizeCellNotification = @"GormResizeCellNotification";
 		}
 	    }
 
-	  // save the services menu...
-	  if([self servicesMenu] == servicesMenu)
-	    {
-	      [self setServicesMenu: nil]; // so we don't get the warning...
-	    }
+	  // so we don't get the warning...
+	  [self setServicesMenu: nil]; 
 
 	  // display the current main menu...
 	  [[self mainMenu] display];
@@ -1037,7 +1034,17 @@ NSString *GormResizeCellNotification = @"GormResizeCellNotification";
 	}
 
       [self setMainMenu: mainMenu];
-      [self setServicesMenu: servicesMenu];
+
+      NS_DURING
+	{
+	  [self setServicesMenu: servicesMenu];
+	}
+      NS_HANDLER
+	{
+	  NSDebugLog(@"Exception while setting services menu");
+	}
+
+      NS_ENDHANDLER
       [mainMenu display]; // bring it to the front...
 
       isTesting = NO;