diff --git a/WINGs/userdefaults.c b/WINGs/userdefaults.c
index 876371d8..6b55e8cf 100644
--- a/WINGs/userdefaults.c
+++ b/WINGs/userdefaults.c
@@ -90,13 +90,10 @@ char *wdefaultspathfordomain(const char *domain)
 	slen = strlen(gspath) + strlen(DEFAULTS_DIR) + strlen(domain) + 4;
 	path = wmalloc(slen);
 
-	if (wstrlcpy(path, gspath, slen) >= slen ||
-	    wstrlcat(path, DEFAULTS_DIR, slen) >= slen ||
-	    wstrlcat(path, "/", slen) >= slen ||
-	    wstrlcat(path, domain, slen) >= slen) {
-		wfree(path);
-		return NULL;
-	}
+	strcpy(path, gspath);
+	strcat(path, DEFAULTS_DIR);
+	strcat(path, "/");
+	strcat(path, domain);
 
 	return path;
 }
diff --git a/WINGs/wfilepanel.c b/WINGs/wfilepanel.c
index 6dc8babb..0f128195 100644
--- a/WINGs/wfilepanel.c
+++ b/WINGs/wfilepanel.c
@@ -823,23 +823,14 @@ static char *getCurrentFileName(WMFilePanel * panel)
 	slen = strlen(path) + strlen(file) + 1;
 	ret = wmalloc(slen);
 
-	if (*file != '/' &&
-	    wstrlcat(ret, path, slen) >= slen)
-		goto error;
+	if (file[0] != '/')
+		strcpy(ret, path);
 
-	if (wstrlcat(ret, file, slen) >= slen)
-		goto error;
+	strcat(ret, file);
 
 	wfree(file);
 	wfree(path);
 	return ret;
-
-error:
-	wfree(file);
-	wfree(path);
-	wfree(ret);
-
-	return NULL;
 }