1 files changed, 7 insertions, 1 deletions
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 2cc44455c..222164351 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1652,7 +1652,13 @@ function comment_controls_submit($form, &$form_state) {
   $comments_per_page = $form_state['values']['comments_per_page'];
 
   if ($user->uid) {
-    $user = user_save($user, array('mode' => $mode, 'sort' => $order, 'comments_per_page' => $comments_per_page));
+    $account = user_save($user, array('mode' => $mode, 'sort' => $order, 'comments_per_page' => $comments_per_page));
+    // Terminate if an error occured during user_save().
+    if (!$account) {
+      drupal_set_message(t("Error saving user account."), 'error');
+      return;
+    }
+    $user = $account;
   }
   else {
     $_SESSION['comment_mode'] = $mode;