diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
new file mode 100644
index 9b72eac..b1c417b
*** a/src/bin/scripts/createdb.c
--- b/src/bin/scripts/createdb.c
*************** main(int argc, char *argv[])
*** 208,219 ****
  	}
  
  	PQclear(result);
- 	PQfinish(conn);
  
  	if (comment)
  	{
- 		conn = connectDatabase(dbname, host, port, username, prompt_password, progname);
- 
  		printfPQExpBuffer(&sql, "COMMENT ON DATABASE %s IS ", fmtId(dbname));
  		appendStringLiteralConn(&sql, comment, conn);
  		appendPQExpBuffer(&sql, ";\n");
--- 208,216 ----
*************** main(int argc, char *argv[])
*** 231,239 ****
  		}
  
  		PQclear(result);
- 		PQfinish(conn);
  	}
  
  	exit(0);
  }
  
--- 228,237 ----
  		}
  
  		PQclear(result);
  	}
  
+ 	PQfinish(conn);
+ 	
  	exit(0);
  }