diff --git a/scwx-qt/source/scwx/qt/util/texture_atlas.cpp b/scwx-qt/source/scwx/qt/util/texture_atlas.cpp
index 6aa87dd3..9c5dcc04 100644
--- a/scwx-qt/source/scwx/qt/util/texture_atlas.cpp
+++ b/scwx-qt/source/scwx/qt/util/texture_atlas.cpp
@@ -7,6 +7,7 @@
 
 #if defined(_MSC_VER)
 #   pragma warning(push, 0)
+#   pragma warning(disable : 4702)
 #   pragma warning(disable : 4714)
 #endif
 
diff --git a/wxdata/source/scwx/wsr88d/ar2v_file.cpp b/wxdata/source/scwx/wsr88d/ar2v_file.cpp
index 72368076..b1790d6f 100644
--- a/wxdata/source/scwx/wsr88d/ar2v_file.cpp
+++ b/wxdata/source/scwx/wsr88d/ar2v_file.cpp
@@ -8,6 +8,11 @@
 #include <fstream>
 #include <sstream>
 
+#if defined(_MSC_VER)
+#   pragma warning(push)
+#   pragma warning(disable : 4702)
+#endif
+
 #if defined(__GNUC__)
 #   pragma GCC diagnostic push
 #   pragma GCC diagnostic ignored "-Wdeprecated-copy"
@@ -21,6 +26,10 @@
 #   pragma GCC diagnostic pop
 #endif
 
+#if defined(_MSC_VER)
+#   pragma warning(pop)
+#endif
+
 namespace scwx
 {
 namespace wsr88d
diff --git a/wxdata/source/scwx/wsr88d/level3_file.cpp b/wxdata/source/scwx/wsr88d/level3_file.cpp
index 958fcbd4..8bfb8a6d 100644
--- a/wxdata/source/scwx/wsr88d/level3_file.cpp
+++ b/wxdata/source/scwx/wsr88d/level3_file.cpp
@@ -8,6 +8,7 @@
 
 #if defined(_MSC_VER)
 #   pragma warning(push)
+#   pragma warning(disable : 4702)
 #   pragma warning(disable : 4706)
 #endif
 
diff --git a/wxdata/source/scwx/wsr88d/nexrad_file_factory.cpp b/wxdata/source/scwx/wsr88d/nexrad_file_factory.cpp
index 51b8f72c..8ef0c49d 100644
--- a/wxdata/source/scwx/wsr88d/nexrad_file_factory.cpp
+++ b/wxdata/source/scwx/wsr88d/nexrad_file_factory.cpp
@@ -8,6 +8,7 @@
 
 #if defined(_MSC_VER)
 #   pragma warning(push)
+#   pragma warning(disable : 4702)
 #   pragma warning(disable : 4706)
 #endif
 
diff --git a/wxdata/source/scwx/wsr88d/rpg/graphic_product_message.cpp b/wxdata/source/scwx/wsr88d/rpg/graphic_product_message.cpp
index 29bbd21f..f6f14e7d 100644
--- a/wxdata/source/scwx/wsr88d/rpg/graphic_product_message.cpp
+++ b/wxdata/source/scwx/wsr88d/rpg/graphic_product_message.cpp
@@ -6,6 +6,11 @@
 #include <sstream>
 #include <string>
 
+#if defined(_MSC_VER)
+#   pragma warning(push)
+#   pragma warning(disable : 4702)
+#endif
+
 #if defined(__GNUC__)
 #   pragma GCC diagnostic push
 #   pragma GCC diagnostic ignored "-Wdeprecated-copy"
@@ -19,6 +24,10 @@
 #   pragma GCC diagnostic pop
 #endif
 
+#if defined(_MSC_VER)
+#   pragma warning(pop)
+#endif
+
 namespace scwx
 {
 namespace wsr88d