diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
index 226e6fc..4361e31 100644
--- a/.github/workflows/MainDistributionPipeline.yml
+++ b/.github/workflows/MainDistributionPipeline.yml
@@ -14,9 +14,9 @@ concurrency:
 jobs:
   duckdb-next-build:
     name: Build extension binaries
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.4.4
     with:
-      duckdb_version: main
-      ci_tools_version: main
+      duckdb_version: v1.4.4
+      ci_tools_version: v1.4.4
       extension_name: quackstore
       exclude_archs: "windows_amd64_rtools;windows_amd64;windows_amd64_mingw;wasm_mvp;wasm_eh;wasm_threads"
diff --git a/duckdb b/duckdb
index 64314f2..6ddac80 160000
--- a/duckdb
+++ b/duckdb
@@ -1 +1 @@
-Subproject commit 64314f2882a25e86567a2a9985c6765beb557dc4
+Subproject commit 6ddac802ffa9bcfbcc3f5f0d71de5dff9b0bc250
diff --git a/extension-ci-tools b/extension-ci-tools
index 1d2aa84..af154d2 160000
--- a/extension-ci-tools
+++ b/extension-ci-tools
@@ -1 +1 @@
-Subproject commit 1d2aa847d77edba6f3cb6830b745724e633a7e1e
+Subproject commit af154d26927bc8bdc9be4b3c58cde1c00d196388
diff --git a/src/block_manager.cpp b/src/block_manager.cpp
index 8f69851..7322018 100644
--- a/src/block_manager.cpp
+++ b/src/block_manager.cpp
@@ -301,27 +301,27 @@ void BlockManager::LoadFreeList() {
 void BlockManager::ValidateBlockId(block_id_t block_id) const {
     if (block_id == INVALID_BLOCK_ID) {
         throw duckdb::InvalidInputException(
+            "Block ID cannot be INVALID_BLOCK_ID",
             {
                 {"block_id", std::to_string(block_id)}
-            },
-            "Block ID cannot be INVALID_BLOCK_ID"
+            }
         );
     }
     if (block_id < 0) {
         throw duckdb::InvalidInputException(
+            "Block ID cannot be negative",
             {
                 {"block_id", std::to_string(block_id)}
-            },
-            "Block ID cannot be negative"
+            }
         );
     }
     if (block_id >= max_block) {
         throw duckdb::InvalidInputException(
+            "Block ID cannot exceed max_block",
             {
                 {"block_id", std::to_string(block_id)},
                 {"max_block", std::to_string(max_block)}
-            },
-            "Block ID cannot exceed max_block"
+            }
         );
     }
 }