diff --git a/proof/proof/src/TProof.cxx b/proof/proof/src/TProof.cxx
index 72aad9659d7c2d376199ecdb506c5a073fa620a3..e7627a6b81dc4e449ed2ade9554736aeb5eee757 100644
--- a/proof/proof/src/TProof.cxx
+++ b/proof/proof/src/TProof.cxx
@@ -2937,7 +2937,7 @@ Int_t TProof::HandleInputMessage(TSlave *sl, TMessage *mess, Bool_t deactonfail)
                            TObject *xo = 0;
                            TIter nxin(fPlayer->GetInputList());
                            while ((xo = nxin()))
-                              if (!pq->GetInputList()->FindObject(o->GetName())) pq->AddInput(o->Clone());                             
+                              if (!pq->GetInputList()->FindObject(xo->GetName())) pq->AddInput(xo->Clone());                             
                            // If the last object, notify the GUI that the result arrived
                            QueryResultReady(Form("%s:%s", pq->GetTitle(), pq->GetName()));
                            // Processing is over
diff --git a/proof/proof/src/TProofServ.cxx b/proof/proof/src/TProofServ.cxx
index 45990d87dd92d0dc4c73ac319c9b6030fa90a51d..97ea205bfedf48fc05efb3ebbf570c2a51a17cd2 100644
--- a/proof/proof/src/TProofServ.cxx
+++ b/proof/proof/src/TProofServ.cxx
@@ -4127,13 +4127,11 @@ void TProofServ::ProcessNext(TString *slb)
    // Send back the results
    TQueryResult *pqr = pq->CloneInfo();
    // At least the TDSet name in the light object
-   if (dset) {
-      Info("ProcessNext", "adding info about dataset '%s' in the light query result", dset->GetName());
-      TList rin;
-      TDSet *ds = new TDSet(dset->GetName(), dset->GetObjName());
-      rin.Add(ds);
-      pqr->SetInputList(&rin, kTRUE);
-   }
+   Info("ProcessNext", "adding info about dataset '%s' in the light query result", dset->GetName());
+   TList rin;
+   TDSet *ds = new TDSet(dset->GetName(), dset->GetObjName());
+   rin.Add(ds);
+   pqr->SetInputList(&rin, kTRUE);
    if (fPlayer->GetExitStatus() != TVirtualProofPlayer::kAborted && fPlayer->GetOutputList()) {
       PDB(kGlobal, 2)
          Info("ProcessNext", "sending results");