diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index 781190cf5ac..eeb4ae29dc5 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.8 1996/07/28 06:54:15 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.9 1996/07/31 02:06:00 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -887,7 +887,9 @@ PQprint(FILE *fout,
 	if (po->pager && fout == stdout && isatty(fileno(stdout))) {
 		/* try to pipe to the pager program if possible */
 #ifdef TIOCGWINSZ
-		if (ioctl(fileno(stdout),TIOCGWINSZ,&screen_size) == -1)
+		if (ioctl(fileno(stdout),TIOCGWINSZ,&screen_size) == -1 ||
+		    screen_size.ws_col == 0 ||
+		    screen_size.ws_row == 0)
 		{
 #endif
 			screen_size.ws_row = 24;
@@ -897,6 +899,7 @@ PQprint(FILE *fout,
 #endif
 		pagerenv=getenv("PAGER");
 		if (pagerenv != NULL &&
+		    pagerenv[0] != '\0' && 
 		   !po->html3 &&
 		   ((po->expanded &&
 			nTups * (nFields+1) >= screen_size.ws_row) ||