diff --git a/client.c b/client.c
index ecfd8f0..8d5ea30 100644
--- a/client.c
+++ b/client.c
@@ -52,7 +52,6 @@ focus(Client *c)
 	if (!issel)
 		return;
 	Client *old = sel;
-	XEvent ev;
 
 	sel = c;
 	if(old && old != c)
diff --git a/tag.c b/tag.c
index 01979d5..c4d3b34 100644
--- a/tag.c
+++ b/tag.c
@@ -211,8 +211,10 @@ restack()
 			else
 				m++;
 		}
-
-	n = 2 * (f + m);
+	if(!(n = 2 * (f + m))) {
+		drawstatus();
+		return;
+	}
 	if(nwins < n) {
 		nwins = n;
 		wins = erealloc(wins, nwins * sizeof(Window));