Index: configure
===================================================================
--- configure	(Revision 26)
+++ configure	(Arbeitskopie)
@@ -707,11 +707,16 @@
 * few times and get that HD going :) Then answer the        *
 * Questions which follow. If you are unsure, just hit enter *
 *************************************************************\n\n";
-			make_gnutls_cert();
-			print "\nCertificate generation complete, copying to config directory... ";
-			system("mv key.pem $config{CONFIG_DIR}/key.pem");
-			system("mv cert.pem $config{CONFIG_DIR}/cert.pem");
-			print "Done.\n\n";
+			make_gnutls_cert() or $failed = 1;
+			
+			if ( $failed ne "1" )
+			{	print "\nCertificate generation complete, copying to config directory... ";
+				system("mv key.pem $config{CONFIG_DIR}/key.pem");
+				system("mv cert.pem $config{CONFIG_DIR}/cert.pem");
+				print "Done.\n\n";
+			} else {
+				print "\n\033[1;32mCertificate generation failed!!!\033[0m\n\n";
+			}
 		} else {
 			print "SSL Certificates found, skipping.\n\n"
 		}
Index: make/gnutlscert.pm
===================================================================
--- make/gnutlscert.pm	(Revision 26)
+++ make/gnutlscert.pm	(Arbeitskopie)
@@ -106,8 +106,8 @@
 time_stamping_key
 __END__
 close(FH);
-system("certtool --generate-privkey --outfile key.pem");
-system("certtool --generate-self-signed --load-privkey key.pem --outfile cert.pem --template certtool.template");
+system("certtool --generate-privkey --outfile key.pem") or return 1;
+system("certtool --generate-self-signed --load-privkey key.pem --outfile cert.pem --template certtool.template") or return 1;
 unlink("certtool.template");
 }