diff --git a/includes/common.inc b/includes/common.inc
index 00b2e71..4729538 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -5025,7 +5025,15 @@ function drupal_cron_run() {
     drupal_register_shutdown_function('drupal_cron_cleanup');
 
     // Iterate through the modules calling their cron handlers (if any):
-    module_invoke_all('cron');
+    foreach (module_implements('cron') as $module) {
+      // Do not let an exception thrown by one module disturb another.
+      try {
+        module_invoke($module, 'cron');
+      }
+      catch (Exception $e) {
+        watchdog_exception('cron', $e);
+      }
+    }
 
     // Record cron time
     variable_set('cron_last', REQUEST_TIME);
diff --git a/modules/simpletest/tests/common_test.module b/modules/simpletest/tests/common_test.module
index 9b61788..fe4a0a1 100644
--- a/modules/simpletest/tests/common_test.module
+++ b/modules/simpletest/tests/common_test.module
@@ -225,3 +225,7 @@ function common_test_js_and_css_querystring() {
    drupal_add_css('/' . drupal_get_path('module', 'node') . '/node-fake.css?arg1=value1&arg2=value2');
    return '';
 }
+
+function common_test_cron() {
+  throw new Exception('Uncaught exception');
+}
diff --git a/modules/simpletest/tests/common_test_2.info b/modules/simpletest/tests/common_test_2.info
new file mode 100644
index 0000000..f8699f1
--- /dev/null
+++ b/modules/simpletest/tests/common_test_2.info
@@ -0,0 +1,6 @@
+name = "Common Test 2"
+description = "Support module for Common tests."
+package = Testing
+version = VERSION
+core = 7.x
+hidden = TRUE
diff --git a/modules/simpletest/tests/common_test_2.module b/modules/simpletest/tests/common_test_2.module
new file mode 100644
index 0000000..75c2016
--- /dev/null
+++ b/modules/simpletest/tests/common_test_2.module
@@ -0,0 +1,9 @@
+<?php
+/**
+ * @file
+ * Second helper module for the Common tests.
+ */
+
+function common_test_2_cron() {
+  variable_set('common_test_cron', 'success');
+}
diff --git a/modules/system/system.test b/modules/system/system.test
index ae69d1f..b2f0f94 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -576,6 +576,10 @@ class CronRunTestCase extends DrupalWebTestCase {
     );
   }
 
+  function setUp() {
+    parent::setUp(array('common_test', 'common_test_2'));
+  }
+
   /**
    * Test cron runs.
    */
@@ -680,6 +684,19 @@ class CronRunTestCase extends DrupalWebTestCase {
     $this->assertTrue(file_exists($perm_old->uri), t('Old permanent file was correctly ignored.'));
     $this->assertTrue(file_exists($perm_new->uri), t('New permanent file was correctly ignored.'));
   }
+
+  /**
+   * Make sure exceptions thrown on hook_cron don't affect other modules.
+   */
+  function testCronExceptions() {
+    variable_del('common_test_cron');
+    // The common_test module throws an exception. If it isn't caught, the tests
+    // won't finish successfully.
+    // The common_test_2 module sets the 'common_test_cron' variable.
+    $this->cronRun();
+    $result = variable_get('common_test_cron');
+    $this->assertEqual($result, 'success', t('Cron correctly handles exceptions thrown during hook_cron invocations.'));
+  }
 }
 
 class AdminMetaTagTestCase extends DrupalWebTestCase {