diff --git a/src/applets/battery.c b/src/applets/battery.c
index e74bc90..67fcc3d 100644
--- a/src/applets/battery.c
+++ b/src/applets/battery.c
@@ -486,12 +486,12 @@ static gboolean _battery_on_timeout(gpointer data)
 
 	if(_battery_get(battery, &level, &charging) == FALSE)
 	{
-		helper->error(NULL, error_get(), 1);
+		helper->error(NULL, error_get(NULL), 1);
 		timeout = 0;
 	}
 	else if(level == error || level < 0.0)
 	{
-		helper->error(NULL, error_get(), 1);
+		helper->error(NULL, error_get(NULL), 1);
 		timeout = 30000;
 	}
 	else
diff --git a/src/applets/bluetooth.c b/src/applets/bluetooth.c
index 05db70e..4aa68a7 100644
--- a/src/applets/bluetooth.c
+++ b/src/applets/bluetooth.c
@@ -222,7 +222,7 @@ static gboolean _bluetooth_on_timeout(gpointer data)
 
 	if(_bluetooth_get(bluetooth, &active) == FALSE)
 	{
-		bluetooth->helper->error(NULL, error_get(), 1);
+		bluetooth->helper->error(NULL, error_get(NULL), 1);
 		_bluetooth_set(bluetooth, FALSE);
 		bluetooth->timeout = 0;
 		return FALSE;
diff --git a/src/applets/brightness.c b/src/applets/brightness.c
index 9b75ff8..a992bbd 100644
--- a/src/applets/brightness.c
+++ b/src/applets/brightness.c
@@ -219,7 +219,7 @@ static gboolean _brightness_get(Brightness * brightness, int * level)
 	/* FIXME not supported */
 	*level = -1;
 	error_set("%s: %s", applet.name, strerror(ENOSYS));
-	helper->error(NULL, error_get(), 1);
+	helper->error(NULL, error_get(NULL), 1);
 	return FALSE;
 #endif
 }
diff --git a/src/applets/clock.c b/src/applets/clock.c
index 7c89257..b7253e0 100644
--- a/src/applets/clock.c
+++ b/src/applets/clock.c
@@ -134,7 +134,7 @@ static gboolean _clock_on_timeout(gpointer data)
 	{
 		error_set("%s: %s: %s", applet.name, "gettimeofday",
 				strerror(errno));
-		helper->error(NULL, error_get(), 1);
+		helper->error(NULL, error_get(NULL), 1);
 		return TRUE;
 	}
 	t = tv.tv_sec;
diff --git a/src/applets/cpu.c b/src/applets/cpu.c
index 28e66f8..951074d 100644
--- a/src/applets/cpu.c
+++ b/src/applets/cpu.c
@@ -198,7 +198,7 @@ static gboolean _cpu_on_timeout(gpointer data)
 	if(_cpu_get(cpu, &level) == FALSE)
 	{
 		cpu->timeout = 0;
-		helper->error(NULL, error_get(), 1);
+		helper->error(NULL, error_get(NULL), 1);
 		return FALSE;
 	}
 	_cpu_set(cpu, level);
diff --git a/src/applets/cpufreq.c b/src/applets/cpufreq.c
index ec8330c..0fe5a5d 100644
--- a/src/applets/cpufreq.c
+++ b/src/applets/cpufreq.c
@@ -178,7 +178,7 @@ static gboolean _cpufreq_on_timeout(gpointer data)
 	{
 		error_set("%s: %s: %s", applet.name, cpufreq->name,
 				strerror(errno));
-		helper->error(NULL, error_get(), 1);
+		helper->error(NULL, error_get(NULL), 1);
 		return TRUE;
 	}
 	snprintf(buf, sizeof(buf), "%4u", (unsigned int)freq);
diff --git a/src/applets/gps.c b/src/applets/gps.c
index d0a86f5..5b471bf 100644
--- a/src/applets/gps.c
+++ b/src/applets/gps.c
@@ -174,7 +174,7 @@ static gboolean _gps_on_timeout(gpointer data)
 
 	if(_gps_get(gps, &active) == FALSE)
 	{
-		gps->helper->error(NULL, error_get(), 1);
+		gps->helper->error(NULL, error_get(NULL), 1);
 		_gps_set(gps, FALSE);
 		gps->timeout = 0;
 		return FALSE;
diff --git a/src/applets/gsm.c b/src/applets/gsm.c
index 02296db..a7dd2c3 100644
--- a/src/applets/gsm.c
+++ b/src/applets/gsm.c
@@ -202,7 +202,7 @@ static gboolean _gsm_on_timeout(gpointer data)
 
 	if(_gsm_get(gsm, &active) == FALSE)
 	{
-		gsm->helper->error(NULL, error_get(), 1);
+		gsm->helper->error(NULL, error_get(NULL), 1);
 		_gsm_set(gsm, FALSE);
 		gsm->timeout = 0;
 		return FALSE;
diff --git a/src/applets/memory.c b/src/applets/memory.c
index 29b4748..77a344b 100644
--- a/src/applets/memory.c
+++ b/src/applets/memory.c
@@ -149,7 +149,7 @@ static gboolean _memory_on_timeout(gpointer data)
 	{
 		error_set("%s: %s: %s", applet.name, "sysinfo",
 				strerror(errno));
-		return memory->helper->error(NULL, error_get(), TRUE);
+		return memory->helper->error(NULL, error_get(NULL), TRUE);
 	}
 	value = sy.sharedram;
 	value /= sy.totalram;
diff --git a/src/applets/menu.c b/src/applets/menu.c
index 7393b72..4d2a637 100644
--- a/src/applets/menu.c
+++ b/src/applets/menu.c
@@ -843,7 +843,7 @@ static void _idle_path(Menu * menu, char const * path, char const * apppath)
 			config_reset(config);
 		if(config == NULL || config_load(config, name) != 0)
 		{
-			menu->helper->error(NULL, error_get(), 1);
+			menu->helper->error(NULL, error_get(NULL), 1);
 			continue;
 		}
 		/* skip this entry if it is deleted */
diff --git a/src/applets/mixer.c b/src/applets/mixer.c
index 732f751..70298a8 100644
--- a/src/applets/mixer.c
+++ b/src/applets/mixer.c
@@ -400,13 +400,13 @@ static int _mixer_spawn(Mixer * mixer, unsigned long * xid)
 	if((size = read(out, buf, sizeof(buf) - 1)) <= 0) /* XXX may block */
 	{
 		error_set("%s: %s: %s", applet.name, "read", strerror(errno));
-		return -helper->error(helper->panel, error_get(), 1);
+		return -helper->error(helper->panel, error_get(NULL), 1);
 	}
 	buf[size] = '\0';
 	if(sscanf(buf, "%lu", xid) != 1)
 	{
 		error_set("%s: %s", applet.name, _("Could not start mixer"));
-		return -helper->error(helper->panel, error_get(), 1);
+		return -helper->error(helper->panel, error_get(NULL), 1);
 	}
 	return 0;
 }
diff --git a/src/applets/network.c b/src/applets/network.c
index c11eec4..ff2ae09 100644
--- a/src/applets/network.c
+++ b/src/applets/network.c
@@ -134,7 +134,7 @@ static Network * _network_init(PanelAppletHelper * helper, GtkWidget ** widget)
 	if((network->fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
 	{
 		error_set("%s: %s: %s", applet.name, "socket", strerror(errno));
-		network->helper->error(NULL, error_get(), 1);
+		network->helper->error(NULL, error_get(NULL), 1);
 	}
 	network->interfaces = NULL;
 	network->interfaces_cnt = 0;
@@ -227,7 +227,8 @@ static void _refresh_interface(Network * network, char const * name,
 		if((res = _refresh_interface_add(network, name, flags)) != 0)
 		{
 			if(res < 0)
-				network->helper->error(NULL, error_get(), 1);
+				network->helper->error(NULL, error_get(NULL),
+						1);
 			return;
 		}
 	_refresh_interface_flags(network, &network->interfaces[i], flags);
diff --git a/src/applets/usb.c b/src/applets/usb.c
index 7134491..4cf8eab 100644
--- a/src/applets/usb.c
+++ b/src/applets/usb.c
@@ -181,7 +181,7 @@ static gboolean _usb_on_timeout(gpointer data)
 
 	if(_usb_get(usb, &active) == FALSE)
 	{
-		usb->helper->error(NULL, error_get(), 1);
+		usb->helper->error(NULL, error_get(NULL), 1);
 		_usb_set(usb, FALSE);
 		usb->timeout = 0;
 		return FALSE;
diff --git a/src/applets/volume.c b/src/applets/volume.c
index 78de88c..9ebe9ea 100644
--- a/src/applets/volume.c
+++ b/src/applets/volume.c
@@ -201,7 +201,7 @@ static Volume * _volume_new(PanelAppletHelper * helper)
 	{
 		error_set("%s: %s: %s", applet.name, volume->device,
 				strerror(errno));
-		helper->error(NULL, error_get(), 1);
+		helper->error(NULL, error_get(NULL), 1);
 		return volume;
 	}
 	for(i = 0; volume->outputs == -1 || volume->mix == -1; i++)
@@ -252,7 +252,7 @@ static Volume * _volume_new(PanelAppletHelper * helper)
 	{
 		error_set("%s: %s: %s", applet.name, volume->device,
 				strerror(errno));
-		helper->error(NULL, error_get(), 1);
+		helper->error(NULL, error_get(NULL), 1);
 	}
 	else
 		volume->source = g_timeout_add(timeout,
@@ -272,7 +272,7 @@ static void _volume_delete(Volume * volume)
 	{
 		error_set("%s: %s: %s", applet.name, volume->device,
 				strerror(errno));
-		volume->helper->error(NULL, error_get(), 1);
+		volume->helper->error(NULL, error_get(NULL), 1);
 	}
 #elif defined(SND_LIB_MAJOR)
 	if(volume->mixer != NULL)
@@ -282,7 +282,7 @@ static void _volume_delete(Volume * volume)
 	{
 		error_set("%s: %s: %s", applet.name, volume->device,
 				strerror(errno));
-		volume->helper->error(NULL, error_get(), 1);
+		volume->helper->error(NULL, error_get(NULL), 1);
 	}
 #endif
 	free(volume);
@@ -311,7 +311,7 @@ static gdouble _volume_get(Volume * volume)
 		{
 			error_set("%s: %s: %s", applet.name,
 					"AUDIO_MIXER_DEVINFO", strerror(errno));
-			helper->error(NULL, error_get(), 1);
+			helper->error(NULL, error_get(NULL), 1);
 			close(volume->fd);
 			volume->fd = -1;
 			break;
@@ -325,7 +325,7 @@ static gdouble _volume_get(Volume * volume)
 		{
 			error_set("%s: %s: %s", applet.name, "AUDIO_MIXER_READ",
 					strerror(errno));
-			helper->error(NULL, error_get(), 1);
+			helper->error(NULL, error_get(NULL), 1);
 		}
 		else
 			ret = mc.un.value.level[0] / 255.0;
@@ -350,7 +350,7 @@ static gdouble _volume_get(Volume * volume)
 	{
 		error_set("%s: %s: %s", applet.name, "MIXER_READ",
 				strerror(errno));
-		helper->error(NULL, error_get(), 1);
+		helper->error(NULL, error_get(NULL), 1);
 		close(volume->fd);
 		volume->fd = -1;
 	}
@@ -400,7 +400,7 @@ int _volume_set(Volume * volume, gdouble value)
 		{
 			error_set("%s: %s: %s", applet.name,
 					"AUDIO_MIXER_WRITE", strerror(errno));
-			ret |= helper->error(NULL, error_get(), 1);
+			ret |= helper->error(NULL, error_get(NULL), 1);
 		}
 		break;
 	}
@@ -423,7 +423,7 @@ int _volume_set(Volume * volume, gdouble value)
 	{
 		error_set("%s: %s: %s", applet.name, "MIXER_WRITE",
 				strerror(errno));
-		ret |= helper->error(NULL, error_get(), 1);
+		ret |= helper->error(NULL, error_get(NULL), 1);
 	}
 #endif
 	return ret;
diff --git a/src/applets/wpa_supplicant.c b/src/applets/wpa_supplicant.c
index 71e6ec7..1bef7d2 100644
--- a/src/applets/wpa_supplicant.c
+++ b/src/applets/wpa_supplicant.c
@@ -491,7 +491,7 @@ static int _wpa_error(WPA * wpa, char const * message, int ret)
 {
 	error_set("%s: %s", applet.name, message);
 	_wpa_set_status(wpa, FALSE, FALSE, NULL);
-	return wpa->helper->error(NULL, error_get(), ret);
+	return wpa->helper->error(NULL, error_get(NULL), ret);
 }
 
 
diff --git a/src/panel.c b/src/panel.c
index 7ae0552..3de6235 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -407,7 +407,7 @@ int panel_error(Panel * panel, char const * message, int ret)
 			"%s", _("Error"));
 	gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
 #endif
-			"%s", (message != NULL) ? message : error_get());
+			"%s", (message != NULL) ? message : error_get(NULL));
 	gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
 	gtk_window_set_title(GTK_WINDOW(dialog), _("Error"));
 	g_signal_connect(dialog, "delete-event", G_CALLBACK(_error_on_closex),
diff --git a/src/run.c b/src/run.c
index 66499c3..badedcb 100644
--- a/src/run.c
+++ b/src/run.c
@@ -515,7 +515,7 @@ int main(int argc, char * argv[])
 	if(optind != argc)
 		return _usage();
 	if((run = _run_new()) == NULL)
-		return _run_error(NULL, error_get(), 2);
+		return _run_error(NULL, error_get(NULL), 2);
 	gtk_main();
 	_run_delete(run);
 	return 0;
diff --git a/tools/helper.c b/tools/helper.c
index 946616a..e6ddff0 100644
--- a/tools/helper.c
+++ b/tools/helper.c
@@ -112,7 +112,7 @@ char const * panel_get_config(Panel * panel, char const * section,
 int panel_error(Panel * panel, char const * message, int ret)
 {
 	fprintf(stderr, "%s: %s\n", PROGNAME, (message != NULL) ? message
-			: error_get());
+			: error_get(NULL));
 	return ret;
 }
 
diff --git a/tools/settings.c b/tools/settings.c
index c79f518..e6f9138 100644
--- a/tools/settings.c
+++ b/tools/settings.c
@@ -265,7 +265,7 @@ static int _settings_browse(Settings * settings)
 	int datadir = 1;
 
 	if((config = config_new()) == NULL)
-		return -_settings_error(error_get(), 1);
+		return -_settings_error(error_get(NULL), 1);
 	model = _settings_get_model(settings);
 	gtk_list_store_clear(GTK_LIST_STORE(model));
 	/* read through every XDG application folder */
@@ -275,7 +275,7 @@ static int _settings_browse(Settings * settings)
 		datadir = 0;
 	}
 	if((p = strdup(path)) == NULL)
-		_settings_error(error_get(), 1);
+		_settings_error(error_get(NULL), 1);
 	else
 		for(i = 0, j = 0;; i++)
 			if(p[i] == '\0')
@@ -331,7 +331,7 @@ static int _settings_browse_folder(Settings * settings, Config * config,
 	fprintf(stderr, "DEBUG: %s(\"%s\")\n", __func__, folder);
 #endif
 	if((path = string_new_append(folder, "/applications", NULL)) == NULL)
-		return -_settings_error(error_get(), 1);
+		return -_settings_error(error_get(NULL), 1);
 	dir = opendir(path);
 	string_delete(path);
 	if(dir == NULL)
@@ -349,7 +349,7 @@ static int _settings_browse_folder(Settings * settings, Config * config,
 		if((path = string_new_append(folder, "/applications/",
 						de->d_name, NULL)) == NULL)
 		{
-			_settings_error(error_get(), 1);
+			_settings_error(error_get(NULL), 1);
 			continue;
 		}
 #ifdef DEBUG
@@ -360,7 +360,7 @@ static int _settings_browse_folder(Settings * settings, Config * config,
 		string_delete(path);
 		if(res != 0)
 		{
-			_settings_error(error_get(), 1);
+			_settings_error(error_get(NULL), 1);
 			continue;
 		}
 		p = config_get(config, section, "Type");
@@ -474,7 +474,7 @@ static int _settings_browse_home(Settings * settings, Config * config)
 	if((homedir = getenv("HOME")) == NULL)
 		homedir = g_get_home_dir();
 	if((p = string_new_append(homedir, "/", fallback, NULL)) == NULL)
-		return -_settings_error(error_get(), 1);
+		return -_settings_error(error_get(NULL), 1);
 	ret = _settings_browse_folder(settings, config, p);
 	free(p);
 	return ret;