Index: mollom.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.admin.inc,v
retrieving revision 1.46
diff -u -p -r1.46 mollom.admin.inc
--- mollom.admin.inc	3 Nov 2010 14:52:06 -0000	1.46
+++ mollom.admin.inc	7 Nov 2010 18:39:33 -0000
@@ -196,11 +196,12 @@ function mollom_admin_configure_form($fo
 
       $all_permissions = array();
       foreach (module_implements('permission') as $module) {
-        $module_permissions = module_invoke($module, 'permission');
-        foreach ($module_permissions as &$info) {
-          $info += array('module' => $module);
+        if ($module_permissions = module_invoke($module, 'permission')) {
+          foreach ($module_permissions as &$info) {
+            $info += array('module' => $module);
+          }
+          $all_permissions += $module_permissions;
         }
-        $all_permissions += $module_permissions;
       }
       // Prepend Mollom's global permission to the list.
       array_unshift($mollom_form['bypass access'], 'bypass mollom protection');
Index: tests/mollom.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/tests/mollom.test,v
retrieving revision 1.74
diff -u -p -r1.74 mollom.test
--- tests/mollom.test	3 Nov 2010 13:00:43 -0000	1.74
+++ tests/mollom.test	7 Nov 2010 18:40:10 -0000
@@ -1877,11 +1877,12 @@ class MollomFormConfigurationTestCase ex
     // Retrieve a list of all permissions to verify them below.
     $all_permissions = array();
     foreach (module_implements('permission') as $module) {
-      $module_permissions = module_invoke($module, 'permission');
-      foreach ($module_permissions as &$info) {
-        $info += array('module' => $module);
+      if ($module_permissions = module_invoke($module, 'permission')) {
+        foreach ($module_permissions as &$info) {
+          $info += array('module' => $module);
+        }
+        $all_permissions += $module_permissions;
       }
-      $all_permissions += $module_permissions;
     }
 
     // Iterate over all unconfigured forms and protect them.