diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
new file mode 100644
index ca427de..f9b564e
*** a/src/bin/pg_dump/pg_backup_archiver.c
--- b/src/bin/pg_dump/pg_backup_archiver.c
*************** _printTocEntry(ArchiveHandle *AH, TocEnt
*** 3246,3252 ****
  		free(sanitized_schema);
  		free(sanitized_owner);
  
! 		if (te->tablespace && !ropt->noTablespace)
  		{
  			char	   *sanitized_tablespace;
  
--- 3246,3252 ----
  		free(sanitized_schema);
  		free(sanitized_owner);
  
! 		if (te->tablespace && strlen(te->tablespace) > 0 && !ropt->noTablespace)
  		{
  			char	   *sanitized_tablespace;
  
