diff --git a/ChangeLog b/ChangeLog
index 0dcca9839..f749e20f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoObject.m (-initWithName:inContainer:): make
+	sure that "_name" is neither nil nor empty.
+
 2012-06-12  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoGroup.m
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index 8736cf050..b7b42ba9f 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -177,6 +177,9 @@
 {
   if ((self = [self init]))
     {
+      if ([_name length] == 0)
+        [NSException raise: NSInvalidArgumentException
+                     format: @"'_name' must not be an empty string"];
       context = [[WOApplication application] context];
       nameInContainer = [_name copy];
       container = _container;