diff --git a/CHANGES b/CHANGES
index 89b669cd7..f973c88d9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -33,6 +33,8 @@ Release 1.1.3 (in development)
 
 * #854: Fix inheritance_diagram raising attribute errors on builtins.
 
+* #832: Fix crashes when putting comments or lone terms in a glossary.
+
 
 Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway!
 ======================================================================
diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py
index 1c68c449e..05672b980 100644
--- a/sphinx/domains/std.py
+++ b/sphinx/domains/std.py
@@ -245,6 +245,9 @@ class Glossary(Directive):
                 continue
             # unindented line -> a term
             if line and not line[0].isspace():
+                # enable comments
+                if line.startswith('.. '):
+                    continue
                 # first term of definition
                 if in_definition:
                     if not was_empty:
@@ -315,7 +318,8 @@ class Glossary(Directive):
             term += system_messages
 
             defnode = nodes.definition()
-            self.state.nested_parse(definition, definition.items[0][1], defnode)
+            if definition:
+                self.state.nested_parse(definition, definition.items[0][1], defnode)
 
             items.append((termtexts,
                           nodes.definition_list_item('', term, defnode)))