diff --git a/extract.sh b/extract.sh
index 811be6ce..bb8533d7 100755
--- a/extract.sh
+++ b/extract.sh
@@ -21,6 +21,9 @@ if [ -d "$UCODE_DIR" ]; then
     rm -r $UCODE_DIR
 fi
 
+if ! ./tools/dkr_assets_tool -bc "$VER" ./include/enums.h ; then
+    exit 1
+fi
 if ! ./tools/dkr_assets_tool -e "$VER" ./assets ./extract-ver ./baseroms . ; then
     exit 1
 fi
diff --git a/tools/dkr_assets_tool_classes/common/util/enumHelper.cpp b/tools/dkr_assets_tool_classes/common/util/enumHelper.cpp
index 51b44a75..d3586be4 100644
--- a/tools/dkr_assets_tool_classes/common/util/enumHelper.cpp
+++ b/tools/dkr_assets_tool_classes/common/util/enumHelper.cpp
@@ -131,6 +131,7 @@ void load_enums_cache() {
 
 void generate_enums_cache(std::string enumsHeaderPath) {
     set_enums_cache_path();
+    ensure_that_path_exists("build/" + get_version() + "/");
     // Generate enums map
     path_must_exist(enumsHeaderPath);
     std::string enumsIncludeText = read_text_file(enumsHeaderPath);