diff --git a/src/client.c b/src/client.c
index 4ad4c51..f83a04b 100644
--- a/src/client.c
+++ b/src/client.c
@@ -267,9 +267,9 @@ client_manage(Window w, XWindowAttributes *wa)
           c->free = (rettrans == Success) || c->hint;
      else
           client_raise(c);
-
      efree(t);
 
+
      client_attach(c);
      XMoveResizeWindow(dpy, c->win, c->geo.x, c->geo.y, c->geo.width, c->geo.height);
      client_map(c);
@@ -427,7 +427,7 @@ client_size_hints(Client *c)
 void
 client_raise(Client *c)
 {
-     if(!c || !c->free)
+     if(!c || c->tile || c->max)
           return;
 
      XRaiseWindow(dpy, c->win);
@@ -477,7 +477,7 @@ client_unmanage(Client *c)
      if(conf.titlebar.exist)
           bar_delete(c->tbar);
      efree(c);
-
+     XSetErrorHandler(errorhandler);
      arrange();
 
      return;