diff --git a/src/sink.c b/src/sink.c
index 3a6cae7..4d811eb 100644
--- a/src/sink.c
+++ b/src/sink.c
@@ -1079,6 +1079,9 @@
 
 	return sink;
 error:
+	if (srv)
+		free_server(srv);
+
 	if (p) {
 		if (p->id)
 			free(p->id);
@@ -1088,16 +1091,6 @@
 		free(p);
 	}
 
-	if (srv) {
-		if (srv->id)
-			free(srv->id);
-		if (srv->conf.file)
-			free((void *)srv->conf.file);
-		if (srv->per_thr)
-		       free(srv->per_thr);
-		free(srv);
-	}
-
 	if (sft)
 		free(sft);