diff --git a/api/schema.sql b/api/schema.sql
index c5103206..ad71c945 100644
--- a/api/schema.sql
+++ b/api/schema.sql
@@ -1,3 +1,5 @@
+\set ON_ERROR_STOP on
+
 CREATE EXTENSION IF NOT EXISTS pgcrypto;
 
 CREATE TABLE IF NOT EXISTS accounts (
@@ -104,6 +106,39 @@ FROM characters leader
 WHERE leader.id = cl.leader_character_id
   AND cl.alignment NOT IN ('citizen', 'criminal');
 
+ALTER TABLE characters
+    ADD COLUMN IF NOT EXISTS clan_id UUID REFERENCES clans(id) ON DELETE SET NULL;
+
+CREATE TABLE IF NOT EXISTS clan_members (
+    clan_id UUID NOT NULL REFERENCES clans(id) ON DELETE CASCADE,
+    character_id UUID NOT NULL REFERENCES characters(id) ON DELETE CASCADE,
+    role TEXT NOT NULL DEFAULT 'member' CHECK (role IN ('leader', 'co_leader', 'member')),
+    joined_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    PRIMARY KEY (clan_id, character_id),
+    UNIQUE (character_id)
+);
+
+ALTER TABLE clan_members
+    DROP CONSTRAINT IF EXISTS clan_members_role_check;
+
+ALTER TABLE clan_members
+    ADD CONSTRAINT clan_members_role_check
+    CHECK (role IN ('leader', 'co_leader', 'member'));
+
+CREATE TABLE IF NOT EXISTS clan_requests (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    clan_id UUID NOT NULL REFERENCES clans(id) ON DELETE CASCADE,
+    character_id UUID NOT NULL REFERENCES characters(id) ON DELETE CASCADE,
+    message TEXT NOT NULL DEFAULT '',
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    UNIQUE (character_id)
+);
+
+CREATE INDEX IF NOT EXISTS idx_clans_leader_character_id ON clans(leader_character_id);
+CREATE INDEX IF NOT EXISTS idx_characters_clan_id ON characters(clan_id);
+CREATE INDEX IF NOT EXISTS idx_clan_members_clan_id ON clan_members(clan_id);
+CREATE INDEX IF NOT EXISTS idx_clan_requests_clan_id ON clan_requests(clan_id);
+
 WITH incompatible_members AS (
     SELECT cm.clan_id, cm.character_id
     FROM clan_members cm
@@ -141,39 +176,6 @@ ALTER TABLE clans
     ADD CONSTRAINT clans_alignment_check
     CHECK (alignment IN ('citizen', 'criminal'));
 
-ALTER TABLE characters
-    ADD COLUMN IF NOT EXISTS clan_id UUID REFERENCES clans(id) ON DELETE SET NULL;
-
-CREATE TABLE IF NOT EXISTS clan_members (
-    clan_id UUID NOT NULL REFERENCES clans(id) ON DELETE CASCADE,
-    character_id UUID NOT NULL REFERENCES characters(id) ON DELETE CASCADE,
-    role TEXT NOT NULL DEFAULT 'member' CHECK (role IN ('leader', 'co_leader', 'member')),
-    joined_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    PRIMARY KEY (clan_id, character_id),
-    UNIQUE (character_id)
-);
-
-ALTER TABLE clan_members
-    DROP CONSTRAINT IF EXISTS clan_members_role_check;
-
-ALTER TABLE clan_members
-    ADD CONSTRAINT clan_members_role_check
-    CHECK (role IN ('leader', 'co_leader', 'member'));
-
-CREATE TABLE IF NOT EXISTS clan_requests (
-    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    clan_id UUID NOT NULL REFERENCES clans(id) ON DELETE CASCADE,
-    character_id UUID NOT NULL REFERENCES characters(id) ON DELETE CASCADE,
-    message TEXT NOT NULL DEFAULT '',
-    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    UNIQUE (character_id)
-);
-
-CREATE INDEX IF NOT EXISTS idx_clans_leader_character_id ON clans(leader_character_id);
-CREATE INDEX IF NOT EXISTS idx_characters_clan_id ON characters(clan_id);
-CREATE INDEX IF NOT EXISTS idx_clan_members_clan_id ON clan_members(clan_id);
-CREATE INDEX IF NOT EXISTS idx_clan_requests_clan_id ON clan_requests(clan_id);
-
 ALTER TABLE characters
     ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMPTZ;