Index: mollom.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.admin.inc,v
retrieving revision 1.1.2.49
diff -u -p -r1.1.2.49 mollom.admin.inc
--- mollom.admin.inc	1 Nov 2010 16:41:06 -0000	1.1.2.49
+++ mollom.admin.inc	6 Nov 2010 17:35:19 -0000
@@ -204,15 +204,17 @@ function mollom_admin_configure_form(&$f
 
       $all_permissions = array();
       foreach (module_implements('perm') as $module) {
-        // Transpose permissions into D7 format.
-        $module_permissions = array_flip(module_invoke($module, 'perm'));
-        foreach ($module_permissions as $permission => $key) {
-          $module_permissions[$permission] = array(
-            'title' => $permission,
-            'module' => $module,
-          );
+        if ($module_permissions = module_invoke($module, 'perm')) {
+          // Transpose permissions into D7 format.
+          $module_permissions = array_flip($module_permissions);
+          foreach ($module_permissions as $permission => $key) {
+            $module_permissions[$permission] = array(
+              'title' => $permission,
+              '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.1.2.73
diff -u -p -r1.1.2.73 mollom.test
--- tests/mollom.test	29 Oct 2010 14:50:26 -0000	1.1.2.73
+++ tests/mollom.test	6 Nov 2010 17:35:51 -0000
@@ -1726,15 +1726,17 @@ class MollomFormConfigurationTestCase ex
     // Retrieve a list of all permissions to verify them below.
     $all_permissions = array();
     foreach (module_implements('perm') as $module) {
-      // Transpose permissions into D7 format.
-      $module_permissions = array_flip(module_invoke($module, 'perm'));
-      foreach ($module_permissions as $permission => $key) {
-        $module_permissions[$permission] = array(
-          'title' => $permission,
-          'module' => $module,
-        );
+      if ($module_permissions = module_invoke($module, 'perm')) {
+        // Transpose permissions into D7 format.
+        $module_permissions = array_flip($module_permissions);
+        foreach ($module_permissions as $permission => $key) {
+          $module_permissions[$permission] = array(
+            'title' => $permission,
+            'module' => $module,
+          );
+        }
+        $all_permissions += $module_permissions;
       }
-      $all_permissions += $module_permissions;
     }
 
     // Iterate over all unconfigured forms and protect them.