diff --git a/src/NServiceBus.SqlServer/AdaptiveExecutor.cs b/src/NServiceBus.SqlServer/AdaptiveExecutor.cs
index 45edc4b9e..1f68d3955 100644
--- a/src/NServiceBus.SqlServer/AdaptiveExecutor.cs
+++ b/src/NServiceBus.SqlServer/AdaptiveExecutor.cs
@@ -44,18 +44,18 @@ void StartTask()
                 var taskId = Guid.NewGuid();
                 var receiveTask = Task.Factory
                     .StartNew(ReceiveLoop, null, token, TaskCreationOptions.LongRunning, TaskScheduler.Default)
-                    .ContinueWith(t =>
+                    .ContinueWith((t, s) =>
                     {
-                        t.Exception.Handle(ex =>
+                        if (t.IsFaulted)
                         {
-                            HandleException(ex);
-                            circuitBreaker.Failure(ex);
-                            return true;
-                        });
+                            t.Exception.Handle(ex =>
+                            {
+                                HandleException(ex);
+                                circuitBreaker.Failure(ex);
+                                return true;
+                            });
+                        }
 
-                    }, token, TaskContinuationOptions.OnlyOnFaulted, TaskScheduler.Default)
-                    .ContinueWith((_, s) =>
-                    {
                         taskTracker.Forget((Guid)s);
 
                         if (!taskTracker.ShouldStartAnotherTaskImmediately)
diff --git a/src/NServiceBus.SqlServer/NServiceBus.SqlServer.csproj b/src/NServiceBus.SqlServer/NServiceBus.SqlServer.csproj
index 1029f20cd..f0d713873 100644
--- a/src/NServiceBus.SqlServer/NServiceBus.SqlServer.csproj
+++ b/src/NServiceBus.SqlServer/NServiceBus.SqlServer.csproj
@@ -15,7 +15,7 @@
     <AssemblyOriginatorKeyFile>$(SolutionDir)NServiceBus.snk</AssemblyOriginatorKeyFile>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>3ead7d6a</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>6113ccb8</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -130,15 +130,15 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Fody.1.24.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.24.0\build\Fody.targets')" />
+  <Import Project="..\packages\Fody.1.29.3\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.1.29.3\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.1.24.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.24.0\build\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.1.29.3\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.3\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
     <Error Condition="!Exists('..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets'))" />
     <Error Condition="!Exists('..\packages\NuGetPackager.0.5.2\build\NuGetPackager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.5.2\build\NuGetPackager.targets'))" />
   </Target>
   <Import Project="..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" />
   <Import Project="..\packages\NuGetPackager.0.5.2\build\NuGetPackager.targets" Condition="Exists('..\packages\NuGetPackager.0.5.2\build\NuGetPackager.targets')" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/NServiceBus.SqlServer/packages.config b/src/NServiceBus.SqlServer/packages.config
index acae12b57..8da7c6068 100644
--- a/src/NServiceBus.SqlServer/packages.config
+++ b/src/NServiceBus.SqlServer/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fody" version="1.24.0" targetFramework="net45" developmentDependency="true" />
+  <package id="Fody" version="1.29.3" targetFramework="net45" developmentDependency="true" />
   <package id="GitVersionTask" version="2.0.1" targetFramework="net45" developmentDependency="true" />
   <package id="Janitor.Fody" version="0.6.1.0" targetFramework="net45" />
   <package id="NServiceBus" version="5.0.0" targetFramework="net45" />