diff --git a/ChangeLog b/ChangeLog
index 3efe0f5d3..f549cd2db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-09  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/WebServerResources/generic.js (parent$): handle the case
+	where window.opener is null.
+
 2011-12-06  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/ContactsUI.js (contactsListCallback):
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index b6c89d514..34de68a60 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -868,7 +868,7 @@ function log(message) {
         try {
             if (window.frameElement && window.frameElement.id) {
                 logWindow = parent.window;
-                while (logWindow.frameElement && window.frameElement.id) 
+                while (logWindow.frameElement && window.frameElement.id)
                     logWindow = logWindow.parent.window;
             }
             else {
@@ -1029,7 +1029,7 @@ function setSearchCriteria(event) {
 
     if (searchValue.ghostPhrase == searchValue.value)
         searchValue.value = "";
-    
+
     searchValue.ghostPhrase = this.innerHTML;
     searchCriteria.value = this.getAttribute('id');
 
@@ -1797,10 +1797,12 @@ function parent$(element) {
 
     if (div)
         p = parent.document;
-    else
+    else if (this.opener)
         p = this.opener.document;
+    else
+        p = null;
 
-    return p.getElementById(element);
+    return (p ? p.getElementById(element) : null);
 }
 
 /* stubs */