diff --git a/sysdeps/common/error.c b/sysdeps/common/error.c
index df01ede8..6e8772b6 100644
--- a/sysdeps/common/error.c
+++ b/sysdeps/common/error.c
@@ -21,18 +21,26 @@
 
 #include <glibtop/error.h>
 
-#define DEFAULT_NAME	"ERROR"
+#define DEFAULT_NAME	"LibGTop-Server"
 
 /* Prints error message and exits. */
 
+static void
+print_server_name (glibtop *server)
+{
+	fprintf (stderr, "%s: ", server ? 
+		 (server->name ? server->name : DEFAULT_NAME)
+		 : DEFAULT_NAME);
+}
+
 void
 glibtop_error_r (glibtop *server, char *format, ...)
 {
 	va_list	ap;
 	
 	va_start (ap, format);
-	
-	fprintf (stderr, "%s: ", server ? server->name : DEFAULT_NAME);
+
+	print_server_name (server);	
 	vfprintf (stderr, format, ap);
 	fprintf (stderr, "\n");
 	
@@ -47,7 +55,7 @@ glibtop_error_io_r (glibtop *server, char *format, ...)
 	
 	va_start (ap, format);
 	
-	fprintf (stderr, "%s: ", server ? server->name : DEFAULT_NAME);
+	print_server_name (server);
 	vfprintf (stderr, format, ap);
 	fprintf (stderr, ": %s\n", strerror (errno));
 	
@@ -62,7 +70,7 @@ glibtop_warn_r (glibtop *server, char *format, ...)
 	
 	va_start (ap, format);
 	
-	fprintf (stderr, "%s: ", server ? server->name : DEFAULT_NAME);
+	print_server_name (server);
 	vfprintf (stderr, format, ap);
 	fprintf (stderr, "\n");
 	
@@ -76,7 +84,7 @@ glibtop_warn_io_r (glibtop *server, char *format, ...)
 	
 	va_start (ap, format);
 	
-	fprintf (stderr, "%s: ", server ? server->name : DEFAULT_NAME);
+	print_server_name (server);
 	vfprintf (stderr, format, ap);
 	fprintf (stderr, ": %s\n", strerror (errno));