diff --git a/minecraft/download.cgi b/minecraft/download.cgi
index f20353934..5e420fcc1 100755
--- a/minecraft/download.cgi
+++ b/minecraft/download.cgi
@@ -35,6 +35,7 @@ if ($in{'new'} && !-d $config{'minecraft_dir'}) {
 # Download to temp file
 my $temp = &transname();
 $progress_callback_url = &get_server_jar_url();
+$progress_callback_url || &error($text{'download_eurl'});
 my ($host, $port, $page, $ssl) = &parse_http_url($progress_callback_url);
 &http_download($host, $port, $page, $temp, undef, \&progress_callback, $ssl);
 
diff --git a/minecraft/lang/en b/minecraft/lang/en
index be5adb859..e4a7e2839 100644
--- a/minecraft/lang/en
+++ b/minecraft/lang/en
@@ -263,6 +263,7 @@ download_emkdir=Directory creation failed!
 download_err=Failed to setup Minecraft server
 download_edir=Missing or non-absolute install directory
 download_euser=User to run as does not exist
+download_eurl=Failed to get server download URL
 
 backup_title=Scheduled Backup
 backup_header=Options for scheduled world backup
diff --git a/minecraft/minecraft-lib.pl b/minecraft/minecraft-lib.pl
index 47989a8d4..fb7d44774 100644
--- a/minecraft/minecraft-lib.pl
+++ b/minecraft/minecraft-lib.pl
@@ -11,7 +11,7 @@ our ($module_root_directory, %text, %gconfig, $root_directory, %config,
      $module_name, $remote_user, $base_remote_user, $gpgpath,
      $module_config_directory, @lang_order_list, @root_directories);
 our $history_file = "$module_config_directory/history.txt";
-our $download_page_url = "https://minecraft.net/download";
+our $download_page_url = "http://minecraft.net/download";
 our $playtime_dir = "$module_config_directory/playtime";
 
 &foreign_require("webmin");
@@ -584,7 +584,7 @@ my ($host, $port, $page, $ssl) = &parse_http_url($download_page_url);
 return undef if (!$host);
 my ($out, $err);
 &http_download($host, $port, $page, \$out, \$err, undef, $ssl);
-return undef if (!$err);
+return undef if ($err);
 $out =~ /"((http|https):[^"]+minecraft_server[^"]+\.jar)"/ || return undef;
 return $1;
 }
diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index d91dc365f..b8e400458 100755
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -4175,12 +4175,12 @@ if ($main::webmin_script_type eq 'cron') {
 if (($ENV{'WEBMIN_DEBUG'} || $gconfig{'debug_enabled'}) &&
     !$main::opened_debug_log++) {
 	my $dlog = $gconfig{'debug_file'} || $main::default_debug_log_file;
-	if ($gconfig{'debug_size'}) {
-		my @st = stat($dlog);
-		if ($st[7] > $gconfig{'debug_size'}) {
-			rename($dlog, $dlog.".0");
-			}
+	my $dsize = $gconfig{'debug_size'} || $main::default_debug_log_size;
+	my @st = stat($dlog);
+	if ($dsize && $st[7] > $dsize) {
+		rename($dlog, $dlog.".0");
 		}
+
 	open(main::DEBUGLOG, ">>$dlog");
 	$main::opened_debug_log = 1;