Index: comment_notify.module
===================================================================
--- comment_notify.module	(revision 6459)
+++ comment_notify.module	(working copy)
@@ -377,7 +377,9 @@
 
   if (function_exists('locale')) {
     $languages = locale_language_list();
-    $languages = $languages['name'];
+    if (isset($languages['name'])) {
+      $language = $languages['name'];
+    }
   }
 
   $node = node_load($nid);
@@ -514,10 +516,11 @@
         ))
       );
 
-      // revert to previous (site default) locale
-      $language = $initial_language;
     }
   }
+  // revert to previous (site default) locale
+  $language = $initial_language;
+
   // Record that a notification was sent for this comment so that
   // notifications aren't sent again if the comment is later edited.
   db_query('UPDATE {comment_notify} SET notified = 1 WHERE cid = %d', $cid);