diff --git a/Codist/Helpers/CodeAnalysisHelper.cs b/Codist/Helpers/CodeAnalysisHelper.cs
index daef5c89..c1a2190a 100644
--- a/Codist/Helpers/CodeAnalysisHelper.cs
+++ b/Codist/Helpers/CodeAnalysisHelper.cs
@@ -624,7 +624,7 @@ public static string GetDeclarationSignature(this SyntaxNode node, int position
 				case SyntaxKind.ExpressionStatement: return ((ExpressionStatementSyntax)node).Expression.GetExpressionSignature();
 				case SyntaxKind.Attribute: return ((AttributeSyntax)node).Name.ToString();
 				case SyntaxKind.AttributeArgumentList: return GetAttributeArgumentListSignature((AttributeArgumentListSyntax)node);
-				case SyntaxKind.YieldReturnStatement: return ((YieldStatementSyntax)node).Expression.GetExpressionSignature();
+				case SyntaxKind.YieldReturnStatement: return ((YieldStatementSyntax)node).Expression?.GetExpressionSignature();
 				case SyntaxKind.GotoStatement:
 				case SyntaxKind.GotoCaseStatement:
 					return ((GotoStatementSyntax)node).Expression?.GetExpressionSignature();