diff --git a/src/browser.c b/src/browser.c
index 989321b..0bd823c 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -779,7 +779,7 @@ int browser_config_load(Browser * browser)
 	if((filename = _common_config_filename(BROWSER_CONFIG_FILE)) == NULL)
 		return -1;
 	if(config_load(browser->config, filename) != 0)
-		browser_error(NULL, error_get(), 1);
+		browser_error(NULL, error_get(NULL), 1);
 	free(filename);
 #if GTK_CHECK_VERSION(2, 6, 0)
 	/* XXX deserves a rework (enum) */
@@ -1016,17 +1016,17 @@ int browser_load(Browser * browser, char const * plugin)
 	if(_browser_plugin_is_enabled(browser, plugin))
 		return 0;
 	if((p = plugin_new(LIBDIR, PACKAGE, "plugins", plugin)) == NULL)
-		return -browser_error(NULL, error_get(), 1);
+		return -browser_error(NULL, error_get(NULL), 1);
 	if((bpd = plugin_lookup(p, "plugin")) == NULL)
 	{
 		plugin_delete(p);
-		return -browser_error(NULL, error_get(), 1);
+		return -browser_error(NULL, error_get(NULL), 1);
 	}
 	if(bpd->init == NULL || bpd->destroy == NULL || bpd->get_widget == NULL
 			|| (bp = bpd->init(&browser->pl_helper)) == NULL)
 	{
 		plugin_delete(p);
-		return -browser_error(NULL, error_get(), 1);
+		return -browser_error(NULL, error_get(NULL), 1);
 	}
 	widget = bpd->get_widget(bp);
 	gtk_widget_hide(widget);
@@ -2462,7 +2462,7 @@ static char const * _browser_config_get(Browser * browser, char const * section,
 	if(section != NULL && (s = string_new_append("plugin::", section, NULL))
 			== NULL)
 	{
-		browser_error(NULL, error_get(), 1);
+		browser_error(NULL, error_get(NULL), 1);
 		return NULL;
 	}
 	ret = config_get(browser->config, s, variable);
@@ -2481,13 +2481,13 @@ static int _browser_config_set(Browser * browser, char const * section,
 
 	if(section != NULL && (s = string_new_append("plugin::", section, NULL))
 			== NULL)
-		return -browser_error(NULL, error_get(), 1);
+		return -browser_error(NULL, error_get(NULL), 1);
 	if((ret = config_set(browser->config, s, variable, value)) == 0
 			&& (filename = _common_config_filename(
 					BROWSER_CONFIG_FILE)) != NULL)
 	{
 		if(config_save(browser->config, filename) != 0)
-			browser_error(NULL, error_get(), 1);
+			browser_error(NULL, error_get(NULL), 1);
 		free(filename);
 	}
 	string_delete(s);
diff --git a/src/desktop.c b/src/desktop.c
index 2ed04b8..b378324 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -1368,7 +1368,7 @@ static int _error_text(char const * message, char const * error, int ret)
 /* desktop_serror */
 static int _desktop_serror(Desktop * desktop, char const * message, int ret)
 {
-	return _desktop_error(desktop, message, error_get(), ret);
+	return _desktop_error(desktop, message, error_get(NULL), ret);
 }
 
 
diff --git a/src/plugins/cvs.c b/src/plugins/cvs.c
index 60c5f16..a1fc217 100644
--- a/src/plugins/cvs.c
+++ b/src/plugins/cvs.c
@@ -431,7 +431,7 @@ static void _refresh_error(CVS * cvs, char const * message)
 	BrowserPluginHelper * helper = cvs->helper;
 
 	error_set("%s: %s", message, strerror(errno));
-	helper->error(helper->browser, error_get(), 1);
+	helper->error(helper->browser, error_get(NULL), 1);
 }
 
 static void _refresh_file(CVS * cvs)
@@ -611,7 +611,7 @@ static int _cvs_add_task(CVS * cvs, char const * title, char const * directory,
 	cvs->tasks = p;
 	if((task = _common_task_new(helper, &plugin, title, directory, argv,
 					callback, cvs)) == NULL)
-		return -helper->error(helper->browser, error_get(), 1);
+		return -helper->error(helper->browser, error_get(NULL), 1);
 	cvs->tasks[cvs->tasks_cnt++] = task;
 	return 0;
 }
diff --git a/src/plugins/git.c b/src/plugins/git.c
index 7b85840..7104366 100644
--- a/src/plugins/git.c
+++ b/src/plugins/git.c
@@ -327,7 +327,7 @@ static void _refresh_error(Git * git, char const * message)
 	BrowserPluginHelper * helper = git->helper;
 
 	error_set("%s: %s", message, strerror(errno));
-	helper->error(helper->browser, error_get(), 1);
+	helper->error(helper->browser, error_get(NULL), 1);
 }
 
 static void _refresh_file(Git * git)
@@ -411,7 +411,7 @@ static int _git_add_task(Git * git, char const * title,
 	git->tasks = p;
 	if((task = _common_task_new(helper, &plugin, title, directory, argv,
 					callback, git)) == NULL)
-		return -helper->error(helper->browser, error_get(), 1);
+		return -helper->error(helper->browser, error_get(NULL), 1);
 	git->tasks[git->tasks_cnt++] = task;
 	return 0;
 }
diff --git a/src/plugins/make.c b/src/plugins/make.c
index 8390e9e..48c5a3d 100644
--- a/src/plugins/make.c
+++ b/src/plugins/make.c
@@ -333,7 +333,7 @@ static void _refresh_error(Make * make, char const * message)
 	BrowserPluginHelper * helper = make->helper;
 
 	error_set("%s: %s", message, strerror(errno));
-	helper->error(helper->browser, error_get(), 1);
+	helper->error(helper->browser, error_get(NULL), 1);
 }
 
 static void _refresh_file(Make * make)
@@ -459,7 +459,7 @@ static int _make_add_task(Make * make, char const * title,
 	make->tasks = p;
 	if((task = _common_task_new(helper, &plugin, title, directory, argv,
 					NULL, NULL)) == NULL)
-		return -helper->error(helper->browser, error_get(), 1);
+		return -helper->error(helper->browser, error_get(NULL), 1);
 	make->tasks[make->tasks_cnt++] = task;
 	return 0;
 }
diff --git a/src/plugins/subversion.c b/src/plugins/subversion.c
index 69e5744..68c8dc2 100644
--- a/src/plugins/subversion.c
+++ b/src/plugins/subversion.c
@@ -317,7 +317,7 @@ static void _refresh_error(SVN * svn, char const * message)
 	BrowserPluginHelper * helper = svn->helper;
 
 	error_set("%s: %s", message, strerror(errno));
-	helper->error(helper->browser, error_get(), 1);
+	helper->error(helper->browser, error_get(NULL), 1);
 }
 
 static void _refresh_hide(SVN * svn, gboolean name)
@@ -390,7 +390,7 @@ static int _subversion_add_task(SVN * svn, char const * title,
 	svn->tasks = p;
 	if((task = _common_task_new(helper, &plugin, title, directory, argv,
 					NULL, NULL)) == NULL)
-		return -helper->error(helper->browser, error_get(), 1);
+		return -helper->error(helper->browser, error_get(NULL), 1);
 	svn->tasks[svn->tasks_cnt++] = task;
 	return 0;
 }
diff --git a/src/properties.c b/src/properties.c
index b318020..e253e01 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -203,11 +203,11 @@ static Properties * _properties_new(Mime * mime, char const * plugin,
 	gtk_container_add(GTK_CONTAINER(bbox), widget);
 	gtk_widget_show_all(bbox);
 	if(_new_load(properties, plugin) != 0)
-		_properties_error(properties, error_get(), -1);
+		_properties_error(properties, error_get(NULL), -1);
 	else if(filename != NULL)
 	{
 		if(_properties_set_location(properties, filename) != 0)
-			_properties_error(properties, error_get(), -1);
+			_properties_error(properties, error_get(NULL), -1);
 		else
 			gtk_widget_show(properties->window);
 	}
@@ -454,7 +454,7 @@ static int _properties_helper_set_location(Properties * properties,
 	int res;
 
 	if((res = _properties_set_location(properties, filename)) != 0)
-		return -_properties_error(properties, error_get(), 1);
+		return -_properties_error(properties, error_get(NULL), 1);
 	return 0;
 }
 
diff --git a/src/view.c b/src/view.c
index 9c8bdc7..78df192 100644
--- a/src/view.c
+++ b/src/view.c
@@ -524,7 +524,7 @@ static int _view_helper_set_location(View * view, char const * filename)
 	int res;
 
 	if((res = _view_set_location(view, filename)) != 0)
-		return -_view_error(view, error_get(), 1);
+		return -_view_error(view, error_get(NULL), 1);
 	return 0;
 }
 
@@ -682,7 +682,7 @@ int main(int argc, char * argv[])
 				return _usage();
 		}
 	if((mime = mime_new(NULL)) == NULL)
-		return _view_error(NULL, error_get(), 2);
+		return _view_error(NULL, error_get(NULL), 2);
 	if(optind == argc)
 		_view_new_open(mime);
 	else