diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index a32d2c69ee..1e3c1a7fb2 100644
--- a/src/bin/psql/psql.c
+++ b/src/bin/psql/psql.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.43 1996/12/28 02:12:31 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.44 1997/01/02 06:45:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1263,6 +1263,7 @@ MainLoop(PsqlSettings * settings, FILE * source)
     /* main loop for getting queries and executing them */
     while (!eof) {
 	if (slashCmdStatus == 3) {
+	    paren_level = 0;
 	    line = strdup(query);
 	    query[0] = '\0';
 	} else {
@@ -1376,8 +1377,12 @@ MainLoop(PsqlSettings * settings, FILE * source)
 						 query_start,
 						 query);
 		if (slashCmdStatus == 1) {
-		    free(line);
-		    continue;
+		    if (query[0] == '\0')
+		    {
+			paren_level = 0;
+		    	free(line);
+			continue;
+		    }
 		}
 		if (slashCmdStatus == 2) {
 		    free(line);