diff --git a/src/AddIns/Misc/Profiler/Frontend/BenchmarkRunner/BenchmarkRunner.cs b/src/AddIns/Misc/Profiler/Frontend/BenchmarkRunner/BenchmarkRunner.cs
index e603dba091..09a7cd8f8e 100644
--- a/src/AddIns/Misc/Profiler/Frontend/BenchmarkRunner/BenchmarkRunner.cs
+++ b/src/AddIns/Misc/Profiler/Frontend/BenchmarkRunner/BenchmarkRunner.cs
@@ -5,7 +5,6 @@
 //     <version>$Revision$</version>
 // </file>
 
-using ICSharpCode.Profiler.Controller.Data;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -13,7 +12,9 @@ using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
+
 using ICSharpCode.Profiler.Controller;
+using ICSharpCode.Profiler.Controller.Data;
 
 namespace BenchmarkRunner
 {
@@ -47,18 +48,20 @@ namespace BenchmarkRunner
 				}
 			}
 			
-			for (int i = 0; i < TestRunCount; i++) {
-				foreach (TestSeries ts in testSeries) {
-					ts.ExecuteRun();
+			if (testSeries.Any()) {
+				for (int i = 0; i < TestRunCount; i++) {
+					foreach (TestSeries ts in testSeries) {
+						ts.ExecuteRun();
+					}
 				}
+				ResultSet[] results = testSeries.Select(ts=>ts.GetResult()).ToArray();
+				
+				Console.WriteLine();
+				Console.WriteLine();
+				Console.WriteLine();
+				
+				DisplayResults(results);
 			}
-			ResultSet[] results = testSeries.Select(ts=>ts.GetResult()).ToArray();
-			
-			Console.WriteLine();
-			Console.WriteLine();
-			Console.WriteLine();
-			
-			DisplayResults(results);
 			
 			Console.Write("Press any key to continue . . . ");
 			Console.ReadKey(true);
@@ -85,7 +88,7 @@ namespace BenchmarkRunner
 				File.Delete(fileName);
 			
 			using (var profiler = new Profiler(
-				startInfo, new ProfilingDataSQLiteWriter(fileName, false, null), new ProfilerOptions()
+				startInfo, new ProfilingDataSQLiteWriter(fileName), new ProfilerOptions()
 			)) {
 				using (ManualResetEvent mre = new ManualResetEvent(false)) {
 					profiler.SessionEnded += delegate {
diff --git a/src/AddIns/Misc/Profiler/Frontend/BenchmarkRunner/BenchmarkRunner.csproj b/src/AddIns/Misc/Profiler/Frontend/BenchmarkRunner/BenchmarkRunner.csproj
index 1e53143e48..da61ed2c0a 100644
--- a/src/AddIns/Misc/Profiler/Frontend/BenchmarkRunner/BenchmarkRunner.csproj
+++ b/src/AddIns/Misc/Profiler/Frontend/BenchmarkRunner/BenchmarkRunner.csproj
@@ -1,4 +1,5 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{DBEF953E-F7BC-4D54-8A27-B758EC875C49}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -6,7 +7,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>BenchmarkRunner</RootNamespace>
     <AssemblyName>BenchmarkRunner</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <SourceAnalysisOverrideSettingsFile>C:\Users\daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
     <OutputPath>..\..\bin\</OutputPath>
@@ -33,9 +34,12 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <SignAssembly>False</SignAssembly>
+    <DelaySign>False</DelaySign>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugSymbols>True</DebugSymbols>
+    <DebugSymbols>true</DebugSymbols>
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
@@ -50,6 +54,13 @@
     <DefineConstants>TRACE</DefineConstants>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <RegisterForComInterop>True</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <PlatformTarget>x86</PlatformTarget>
+    <FileAlignment>4096</FileAlignment>
+  </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
   <ItemGroup>
     <Reference Include="System" />
@@ -69,13 +80,6 @@
     <Compile Include="BenchmarkRunner.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Controller\Profiler.Controller.csproj">
-      <Project>{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}</Project>
-      <Name>Profiler.Controller</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
       <Visible>False</Visible>
@@ -88,4 +92,13 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Controller\Profiler.Controller.csproj">
+      <Project>{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}</Project>
+      <Name>Profiler.Controller</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/Misc/Profiler/Frontend/BenchmarkRunner/app.config b/src/AddIns/Misc/Profiler/Frontend/BenchmarkRunner/app.config
new file mode 100644
index 0000000000..d8aeb3410e
--- /dev/null
+++ b/src/AddIns/Misc/Profiler/Frontend/BenchmarkRunner/app.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <startup useLegacyV2RuntimeActivationPolicy="true">
+    <supportedRuntime version="v4.0"/>
+  </startup>
+</configuration>
\ No newline at end of file