diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/semicolon/SmartSemicolonHandler.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/semicolon/SmartSemicolonHandler.java
index 005cca6..f250c08 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/semicolon/SmartSemicolonHandler.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/semicolon/SmartSemicolonHandler.java
@@ -149,7 +149,16 @@
           model = model.eContainer();
         }
 
-        if (model instanceof MessageField || model instanceof Group || model instanceof Literal) {
+        if (model instanceof MessageField) {
+          // If a non-indexed MessageElement, such as an Option, contains syntax errors or
+          // unresolved symbols, the Protobuf Parser may mistakenly classify it as a MessageField.
+          // Invalid MessageFields can be filtered out by verifying the presence of the field "name".
+          if (((MessageField) model).getName() != null) {
+            return model;
+          }
+        }
+
+        if (model instanceof Group || model instanceof Literal) {
           return model;
         }
       }