diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h
index 9afbf506..0c52ac7e 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h
@@ -11,7 +11,7 @@
 
 //#undef HAS_CXX11_CONSTEXPR
 
-#define HAS_CXX11_STATIC_ASSERT
+//#define HAS_CXX11_STATIC_ASSERT
 
 #define HAS_CXX11_CSTDINT_H
 
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h
index 65c2789d..d3ef8b49 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h
@@ -29,7 +29,7 @@ freely, subject to the following restrictions:
 #include <stdexcept>
 
 #define POLYVOX_ASSERTS_ENABLED
-#define POLYVOX_THROW_ENABLED
+//#define POLYVOX_THROW_ENABLED
 
 #if defined(_MSC_VER)
     #define POLYVOX_HALT() __debugbreak()