diff --git a/git-send-email.perl b/git-send-email.perl
index 8a1ee0f0d4..5bd689958e 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -378,6 +378,10 @@ sub signal_handler {
 die __("Cannot run git format-patch from outside a repository\n")
 	if $format_patch and not $repo;
 
+die __("`batch-size` and `relogin` must be specified together " .
+	"(via command-line or configuration option)\n")
+	if defined $relogin_delay and not defined $batch_size;
+
 # Now, let's fill any that aren't set in with defaults:
 
 sub read_config {