diff --git a/lib/package.c b/lib/package.c
index e355cfcf6..816686085 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -818,16 +818,13 @@ int rpmReadPackageFile(rpmts ts, FD_t fd,
 	/* XXX Print NOKEY/NOTTRUSTED warning only once. */
     {	int lvl = (rpmtsStashKeyid(ts) ? RPMMESS_DEBUG : RPMMESS_WARNING);
 	rpmMessage(lvl, "%s: %s", fn, buf);
-	rc = RPMRC_OK;
     }	break;
     case RPMRC_NOTFOUND:	/* Signature is unknown type. */
 	rpmMessage(RPMMESS_WARNING, "%s: %s", fn, buf);
-	rc = RPMRC_OK;
 	break;
     default:
     case RPMRC_FAIL:		/* Signature does not verify. */
 	rpmMessage(RPMMESS_ERROR, "%s: %s", fn, buf);
-	rc = RPMRC_FAIL;
 	break;
     }
 
diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index 3e2a0f6db..b22662b5e 100644
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -727,15 +727,15 @@ rpmts_HdrFromFdno(rpmtsObject * s, PyObject * args)
     int fdno;
     rpmRC rpmrc;
 
-if (_rpmts_debug)
-fprintf(stderr, "*** rpmts_HdrFromFdno(%p) ts %p\n", s, s->ts);
-
     if (!PyArg_ParseTuple(args, "i:HdrFromFdno", &fdno)) return NULL;
 
     fd = fdDup(fdno);
     rpmrc = rpmReadPackageFile(s->ts, fd, "rpmts_HdrFromFdno", &h);
     Fclose(fd);
 
+if (_rpmts_debug)
+fprintf(stderr, "*** rpmts_HdrFromFdno(%p) ts %p rc %d\n", s, s->ts, rpmrc);
+
     switch (rpmrc) {
     case RPMRC_OK:
 	if (h)