diff --git a/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec b/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec
index 610f04c79..bdaff2923 100644
--- a/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec
+++ b/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata minClientVersion="2.8">
     <id>GoogleTestAdapter</id>
-    <version>0.12.0</version>
+    <version>0.12.1</version>
     <title>Google Test Adapter</title>
     <authors>Christian Soltenborn</authors>
     <owners>Christian Soltenborn</owners>
diff --git a/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs b/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs
index f3772c89f..d06e5ddd9 100644
--- a/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs
+++ b/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs
@@ -51,7 +51,8 @@ static History()
                 { new Version(0, 10, 2), new DateTime(2017, 8, 27) },
                 { new Version(0, 11, 0), new DateTime(2017, 9, 24) },
                 { new Version(0, 11, 1), new DateTime(2017, 9, 29) },
-                { new Version(0, 12, 0), new DateTime(2017, 10, 20) }
+                { new Version(0, 12, 0), new DateTime(2017, 10, 20) },
+                { new Version(0, 12, 1), new DateTime(2017, 11, 16) }
             };
         }
 
diff --git a/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.12.1.md b/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.12.1.md
new file mode 100644
index 000000000..d22781699
--- /dev/null
+++ b/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.12.1.md
@@ -0,0 +1 @@
+* bugfix: fixed NullReferenceException which could occur during test discovery ([#178](https://github.com/csoltenborn/GoogleTestAdapter/issues/178), thanks to [wasabinza](https://github.com/wasabinza) for report and suggestion for fix)
\ No newline at end of file
diff --git a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj
index 60f9a89b1..cea9b33ac 100644
--- a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj
+++ b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj
@@ -181,6 +181,10 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <Content Include="Resources\ReleaseNotes\0.12.1.md">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <VSCTCompile Include="GoogleTestExtensionOptionsPage.vsct">
diff --git a/README.md b/README.md
index dc9a302c1..6532ff3c7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/8hdgmdy1ogqi606j/branch/master?svg=true)](https://ci.appveyor.com/project/csoltenborn/googletestadapter-u1cxh/branch/master)
 [![Code coverage](https://codecov.io/gh/csoltenborn/GoogleTestAdapter/branch/master/graph/badge.svg)](https://codecov.io/gh/csoltenborn/GoogleTestAdapter)
-[![Visual Studio Marketplace downloads](https://img.shields.io/badge/vs_marketplace-47k-blue.svg)](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter)
+[![Visual Studio Marketplace downloads](https://img.shields.io/badge/vs_marketplace-49k-blue.svg)](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter)
 [![NuGet downloads](https://img.shields.io/nuget/dt/GoogleTestAdapter.svg?colorB=0c7dbe&label=nuget)](https://www.nuget.org/packages/GoogleTestAdapter) 
 
 
@@ -39,14 +39,14 @@ Google Test Adapter (GTA) is a Visual Studio extension providing test discovery
 
 #### Installation
 
-[![Download from Visual Studio Marketplace](https://img.shields.io/badge/vs_marketplace-v0.12.0-blue.svg)](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter)
+[![Download from Visual Studio Marketplace](https://img.shields.io/badge/vs_marketplace-v0.12.1-blue.svg)](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter)
 [![Download from NuGet](https://img.shields.io/nuget/vpre/GoogleTestAdapter.svg?colorB=0c7dbe&label=nuget)](https://www.nuget.org/packages/GoogleTestAdapter)
 [![Download at GitHub](https://img.shields.io/github/release/csoltenborn/GoogleTestAdapter/all.svg?colorB=0c7dbe&label=github)](https://github.com/csoltenborn/GoogleTestAdapter/releases)
 
 Google Test Adapter can be installed in three ways:
 
 * Install through the Visual Studio Marketplace at *Tools/Extensions and Updates* - search for *Google Test Adapter*.
-* Download and launch the VSIX installer from either the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter) or [GitHub](https://github.com/csoltenborn/GoogleTestAdapter/releases/download/v0.12.0/GoogleTestAdapter-0.12.0.vsix)
+* Download and launch the VSIX installer from either the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter) or [GitHub](https://github.com/csoltenborn/GoogleTestAdapter/releases/download/v0.12.1/GoogleTestAdapter-0.12.1.vsix)
 * Add a NuGet dependency to the [Google test adapter nuget package](https://www.nuget.org/packages/GoogleTestAdapter/) to your Google Test projects. Note, however, that Visual Studio integration is limited this way: VS can discover and run tests, but no debugging, options or toolbar will be available; configuration is only possible through solution config files (see below).
 
 After restarting VS, your tests will be displayed in the Test Explorer at build completion time. If no or not all tests show up, have a look at the [trouble shooting section](#trouble_shooting).
diff --git a/appveyor.yml b/appveyor.yml
index 71c4e4597..dfce68f3d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 0.12.0.{build}
+version: 0.12.1.{build}
 os: 
 - Visual Studio 2017
 configuration: Release