diff --git a/UpsilonLanguageServer/Lib/Upsilon.dll b/UpsilonLanguageServer/Lib/Upsilon.dll
index c06dec7..03755be 100644
Binary files a/UpsilonLanguageServer/Lib/Upsilon.dll and b/UpsilonLanguageServer/Lib/Upsilon.dll differ
diff --git a/UpsilonLanguageServer/Lib/Upsilon.pdb b/UpsilonLanguageServer/Lib/Upsilon.pdb
index e3a7729..8e3df75 100644
Binary files a/UpsilonLanguageServer/Lib/Upsilon.pdb and b/UpsilonLanguageServer/Lib/Upsilon.pdb differ
diff --git a/UpsilonLanguageServer/UpsilonLanguageServer/Services/TextDocumentServer.cs b/UpsilonLanguageServer/UpsilonLanguageServer/Services/TextDocumentServer.cs
index aecb546..a8414fe 100644
--- a/UpsilonLanguageServer/UpsilonLanguageServer/Services/TextDocumentServer.cs
+++ b/UpsilonLanguageServer/UpsilonLanguageServer/Services/TextDocumentServer.cs
@@ -123,9 +123,15 @@ namespace UpsilonLanguageServer.Services
                         if (variableSymbol.VariableSymbol is TableVariableSymbol tableSymbol)
                         {
                             return new CompletionList(
-                                tableSymbol.Variables.Select(x => new CompletionItem(x.Key,
-                                    CompletionItemKind.Variable, x.Value.Type.ToString(),
-                                    $"\n\n{string.Join("  \n", x.Value.CommentValue)}")));
+                                tableSymbol.Variables.Select(x =>
+                                {
+                                    var (key, value) = x;
+                                    return new CompletionItem(key,
+                                        CompletionItemKind.Variable, value.Type.ToString(),
+                                        x.Value.CommentValue == null
+                                            ? ""
+                                            : $"\n\n{string.Join("  \n", value.CommentValue)}");
+                                }));
                         }
                         return new CompletionList(
                             new[]