diff --git a/ChangeLog b/ChangeLog
index 6f276c300..a6feeb102 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/WebServerResources/HTMLElement.js:
+	(Element.getSelectedNodesId): if the element has not
+	"selectedIds", set "selArray" to an empty array before checking
+	the "selectedElements" attribute. This enables the caller to not
+	check for a "null" return value.
+
 2010-10-08  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/generic.js (showConfirmDialog)
diff --git a/UI/WebServerResources/HTMLElement.js b/UI/WebServerResources/HTMLElement.js
index 56fb7bcf5..905d01beb 100644
--- a/UI/WebServerResources/HTMLElement.js
+++ b/UI/WebServerResources/HTMLElement.js
@@ -124,11 +124,13 @@ Element.addMethods({
             if (element.selectedIds) {
                 selArray = element.selectedIds;
             }
-            else if (element.selectedElements) {
-                selArray = new Array();
-                for (var i = 0; i < element.selectedElements.length; i++) {
-                    var node = element.selectedElements[i];
-                    selArray.push(node.getAttribute("id"));
+            else {
+                selArray = [];
+                if (element.selectedElements) {
+                    for (var i = 0; i < element.selectedElements.length; i++) {
+                        var node = element.selectedElements[i];
+                        selArray.push(node.getAttribute("id"));
+                    }
                 }
             }