diff --git a/build/vsx/LibLinphone/LibLinphone.vcxproj b/build/vsx/LibLinphone/LibLinphone.vcxproj
index 65ad06dc8..6d8974c3d 100644
--- a/build/vsx/LibLinphone/LibLinphone.vcxproj
+++ b/build/vsx/LibLinphone/LibLinphone.vcxproj
@@ -125,7 +125,7 @@
       <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <PreprocessToFile>false</PreprocessToFile>
       <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <ExceptionHandling>Sync</ExceptionHandling>
+      <ExceptionHandling>Async</ExceptionHandling>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/build/vsx/LibLinphone/LibLinphone.vcxproj.filters b/build/vsx/LibLinphone/LibLinphone.vcxproj.filters
index 23a8a72b9..bc95616ad 100644
--- a/build/vsx/LibLinphone/LibLinphone.vcxproj.filters
+++ b/build/vsx/LibLinphone/LibLinphone.vcxproj.filters
@@ -35,6 +35,7 @@
     <ClCompile Include="..\..\..\coreapi\bellesip_sal\sal_op_presence.c" />
     <ClCompile Include="..\..\..\coreapi\bellesip_sal\sal_op_registration.c" />
     <ClCompile Include="..\..\..\coreapi\bellesip_sal\sal_sdp.c" />
+    <ClCompile Include="..\..\..\coreapi\message_storage.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\coreapi\enum.h" />
diff --git a/build/vsx/LibLinphoneTester-wp8/LibLinphoneTester-wp8.v11.suo b/build/vsx/LibLinphoneTester-wp8/LibLinphoneTester-wp8.v11.suo
index 88762f6d7..abd949b4c 100644
Binary files a/build/vsx/LibLinphoneTester-wp8/LibLinphoneTester-wp8.v11.suo and b/build/vsx/LibLinphoneTester-wp8/LibLinphoneTester-wp8.v11.suo differ
diff --git a/build/vsx/LibLinphoneTester-wp8/LibLinphoneTester-wp8/LibLinphoneTester-wp8.csproj.user b/build/vsx/LibLinphoneTester-wp8/LibLinphoneTester-wp8/LibLinphoneTester-wp8.csproj.user
deleted file mode 100644
index 96fe30de2..000000000
--- a/build/vsx/LibLinphoneTester-wp8/LibLinphoneTester-wp8/LibLinphoneTester-wp8.csproj.user
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <CurrentDeployCmdId>256</CurrentDeployCmdId>
-    <CurrentDeployID>30F105C9-681E-420b-A277-7C086EAD8A4E</CurrentDeployID>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <CurrentDeployCmdId>256</CurrentDeployCmdId>
-    <CurrentDeployID>30F105C9-681E-420b-A277-7C086EAD8A4E</CurrentDeployID>
-  </PropertyGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{C089C8C0-30E0-4E22-80C0-CE093F111A43}">
-        <SilverlightMobileCSProjectFlavor>
-          <FullDeploy>False</FullDeploy>
-          <DebuggerType>Managed</DebuggerType>
-          <Tombstone>False</Tombstone>
-        </SilverlightMobileCSProjectFlavor>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/build/vsx/LibLinphoneTester/LibLinphoneTester.vcxproj b/build/vsx/LibLinphoneTester/LibLinphoneTester.vcxproj
index 4e515921e..cf408958e 100644
--- a/build/vsx/LibLinphoneTester/LibLinphoneTester.vcxproj
+++ b/build/vsx/LibLinphoneTester/LibLinphoneTester.vcxproj
@@ -97,6 +97,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <CompileAsWinRT>false</CompileAsWinRT>
+      <ExceptionHandling>Async</ExceptionHandling>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>