diff --git a/client/client.go b/client/client.go
index c2e8e5b..6c7aabf 100644
--- a/client/client.go
+++ b/client/client.go
@@ -107,12 +107,14 @@ func (c *Client) Pop(ctx context.Context, request *PopRequest) (*Task, bool, err
 
 	var t Task
 	status, err := c.doStatus(ctx, "POST", "/pop", request, &t)
+    if status == http.StatusNoContent {
+		return nil, false, nil
+	}
+    
 	if err != nil {
 		return nil, false, err
 	}
-	if status == http.StatusNoContent {
-		return nil, false, nil
-	}
+	
 	return &t, true, nil
 }