diff --git a/commit.d/format_btrfs b/commit.d/format_btrfs
index a402fdf..3f7044a 100755
--- a/commit.d/format_btrfs
+++ b/commit.d/format_btrfs
@@ -65,9 +65,11 @@ for dev in $DEVICES/*; do
 			db_progress STOP
 
 			if [ "$code" != 0 ]; then
-				db_subst partman-btrfs/create_failed PARTITION "$num"
-				db_subst partman-btrfs/create_failed DEVICE $(humandev $(cat device))
-				db_input critical partman-btrfs/create_failed || true
+				T=partman-basicfilesystems/create_failed
+				db_subst $T FILESYSTEM "$filesystem"
+				db_subst $T PARTITION "$num"
+				db_subst $T DEVICE $(humandev $(cat device))
+				db_input critical $T || true
 				db_go || true
 				#disable_swap
 				exit 1
diff --git a/debian/partman-btrfs.templates b/debian/partman-btrfs.templates
index 2dc9b20..ce178ad 100644
--- a/debian/partman-btrfs.templates
+++ b/debian/partman-btrfs.templates
@@ -1,10 +1,3 @@
-Template: partman-btrfs/create_failed
-Type: error
-# :sl2:
-_Description: Failed to create a file system
- The btrfs file system creation in partition
- #${PARTITION} of ${DEVICE} failed.
-
 Template: partman-btrfs/text/btrfs
 Type: text
 # :sl2: