diff --git a/btrbk b/btrbk
index cfb31d8..b2cf49e 100755
--- a/btrbk
+++ b/btrbk
@@ -4153,13 +4153,17 @@ sub append_config_option($$$$;@)
   if($opt->{deprecated}) {
     my $dh = $opt->{deprecated}{$value} // $opt->{deprecated}{DEFAULT} // {};
     $dh = $opt->{deprecated}{MATCH} if($opt->{deprecated}{MATCH} && ($value =~ $opt->{deprecated}{MATCH}{regex}));
-    if(my $warn_msg = $dh->{warn}) {
-      WARN "Found deprecated option \"$key $value\" $error_statement: $warn_msg";
-    }
     if($dh->{ABORT}) {
-      ERROR "Deprecated (incompatible) option \"$key\" found $error_statement, refusing to continue";
+      ERROR "Deprecated (incompatible) option \"$key\" found $error_statement, refusing to continue", $dh->{warn};
       return undef;
     }
+    my @wmsg = ("Found deprecated option \"$key $value\" $error_statement", $dh->{warn});
+    if(defined($dh->{replace_key})) {
+      $key   = $dh->{replace_key};
+      $value = $dh->{replace_value};
+      push @wmsg, "Using \"$key $value\"";
+    }
+    WARN @wmsg;
     if($dh->{FAILSAFE_PRESERVE}) {
       unless($config_override{FAILSAFE_PRESERVE}) { # warn only once
         WARN "Entering failsafe mode:";
@@ -4171,11 +4175,6 @@ sub append_config_option($$$$;@)
       $config_override{snapshot_preserve_min} = 'all';
       return $config;
     }
-    if(defined($dh->{replace_key})) {
-      $key   = $dh->{replace_key};
-      $value = $dh->{replace_value};
-      WARN "Using \"$key $value\"";
-    }
   }
 
   if($opt->{allow_multiple}) {