diff --git a/brightray/brightray.gypi b/brightray/brightray.gypi
index 2051444cda..46079e0978 100644
--- a/brightray/brightray.gypi
+++ b/brightray/brightray.gypi
@@ -54,11 +54,6 @@
         'WarningLevel': '4',
         'WarnAsError': 'true',
         'DebugInformationFormat': '3',
-        # Programs that use the Standard C++ library must be compiled with
-        # C++
-        # exception handling enabled.
-        # http://support.microsoft.com/kb/154419
-        'ExceptionHandling': 1,
       },
       'VCLinkerTool': {
         'GenerateDebugInformation': 'true',
diff --git a/common.gypi b/common.gypi
index 31797a87ec..07688e2367 100644
--- a/common.gypi
+++ b/common.gypi
@@ -245,6 +245,8 @@
       4302,  # (atldlgs.h) 'type cast': truncation from 'LPCTSTR' to 'WORD'
       4458,  # (atldlgs.h) declaration of 'dwCommonButtons' hides class member
       4503,  # decorated name length exceeded, name was truncated
+      4530,  # C++ exception handler used, but unwind semantics are not enabled. Specify /EHsc
+      4577,  # 'noexcept' used with no exception handling mode specified
       4714,  # (atomicstring.h) function marked as __forceinline not inlined
       4800,  # (v8.h) forcing value to bool 'true' or 'false'
       4819,  # The file contains a character that cannot be represented in the current code page