diff --git a/deps/buildcore/base.cmake b/deps/buildcore/base.cmake
index e8dee546..69f860b3 100644
--- a/deps/buildcore/base.cmake
+++ b/deps/buildcore/base.cmake
@@ -39,7 +39,7 @@ if(NOT MSVC)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=2")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wmissing-field-initializers")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnull-dereference")
+	#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnull-dereference")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wold-style-cast")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpedantic")
diff --git a/deps/buildcore/base.mk b/deps/buildcore/base.mk
index 7bc869cc..5e4d10be 100644
--- a/deps/buildcore/base.mk
+++ b/deps/buildcore/base.mk
@@ -126,7 +126,7 @@ else
 	${VCPKG_DIR}/vcpkg install --triplet x64-windows ${VCPKG_PKGS}
 endif
 
-else # USE_VCPKG ################################################
+else ifdef USE_CONAN # USE_VCPKG ################################################
 
 .PHONY: setup-conan
 conan-config: