diff --git a/src/VisualStudio/Core/Impl/CodeModel/InternalElements/CodeParameter.cs b/src/VisualStudio/Core/Impl/CodeModel/InternalElements/CodeParameter.cs
index 6a963ac8cdec4d6e47928b73862d8fad8672204d..4ad3682f49c5b42bf6feb926ce42177a47e5f3a0 100644
--- a/src/VisualStudio/Core/Impl/CodeModel/InternalElements/CodeParameter.cs
+++ b/src/VisualStudio/Core/Impl/CodeModel/InternalElements/CodeParameter.cs
@@ -64,12 +64,17 @@ protected override EnvDTE.CodeElements GetCollection()
 
         protected override string GetName()
         {
-            return this._name;
+            return _name;
         }
 
         protected override string GetFullName()
         {
             var node = LookupNode();
+            if (node == null)
+            {
+                return string.Empty;
+            }
+
             return CodeModelService.GetParameterFullName(node);
         }
 
diff --git a/src/VisualStudio/Core/Test/CodeModel/AbstractCodeFunctionTests.vb b/src/VisualStudio/Core/Test/CodeModel/AbstractCodeFunctionTests.vb
index ae3081fcae0febeef437353bacec04c00eaab797..45462c861d839e6880780c622f322f3e2c782735 100644
--- a/src/VisualStudio/Core/Test/CodeModel/AbstractCodeFunctionTests.vb
+++ b/src/VisualStudio/Core/Test/CodeModel/AbstractCodeFunctionTests.vb
@@ -169,25 +169,25 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
             End Using
         End Sub
 
-		Protected Sub TestFunctionKind(code As XElement, expected As EnvDTE.vsCMFunction)
-			Using state = CreateCodeModelTestState(GetWorkspaceDefinition(code))
-				Dim codeElement = state.GetCodeElementAtCursor(Of EnvDTE80.CodeFunction2)()
-				Assert.NotNull(codeElement)
+        Protected Sub TestFunctionKind(code As XElement, expected As EnvDTE.vsCMFunction)
+            Using state = CreateCodeModelTestState(GetWorkspaceDefinition(code))
+                Dim codeElement = state.GetCodeElementAtCursor(Of EnvDTE80.CodeFunction2)()
+                Assert.NotNull(codeElement)
 
-				Assert.Equal(expected, codeElement.FunctionKind)
-			End Using
-		End Sub
+                Assert.Equal(expected, codeElement.FunctionKind)
+            End Using
+        End Sub
 
-		Protected Sub TestFunctionKind(code As XElement, expected As EnvDTE80.vsCMFunction2)
-			Using state = CreateCodeModelTestState(GetWorkspaceDefinition(code))
-				Dim codeElement = state.GetCodeElementAtCursor(Of EnvDTE80.CodeFunction2)()
-				Assert.NotNull(codeElement)
+        Protected Sub TestFunctionKind(code As XElement, expected As EnvDTE80.vsCMFunction2)
+            Using state = CreateCodeModelTestState(GetWorkspaceDefinition(code))
+                Dim codeElement = state.GetCodeElementAtCursor(Of EnvDTE80.CodeFunction2)()
+                Assert.NotNull(codeElement)
 
-				Assert.Equal(expected, CType(codeElement.FunctionKind, EnvDTE80.vsCMFunction2))
-			End Using
-		End Sub
+                Assert.Equal(expected, CType(codeElement.FunctionKind, EnvDTE80.vsCMFunction2))
+            End Using
+        End Sub
 
-		Protected Sub TestExtensionMethodExtender_IsExtension(code As XElement, expected As Boolean)
+        Protected Sub TestExtensionMethodExtender_IsExtension(code As XElement, expected As Boolean)
             Using state = CreateCodeModelTestState(GetWorkspaceDefinition(code))
                 Dim codeElement = state.GetCodeElementAtCursor(Of EnvDTE80.CodeFunction2)()
                 Assert.NotNull(codeElement)