diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index 82fa25e490c32e0b09666e39a28cd7b40d85da72..caafb52dfc3fa40abd9935b54bdc228f20b27efc 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -267,6 +267,10 @@ static struct tables *find_table(const char *database, const char *orig_tablenam
 		}
 	}
 
+	if (database == NULL) {
+		return NULL;
+	}
+
 	ast_debug(1, "Table '%s' not found in cache, querying now\n", orig_tablename);
 
 	/* Not found, scan the table */
@@ -1514,7 +1518,7 @@ static char *handle_cli_realtime_pgsql_cache(struct ast_cli_entry *e, int cmd, s
 		AST_LIST_UNLOCK(&psql_tables);
 	} else if (a->argc == 5) {
 		/* List of columns */
-		if ((cur = find_table(cur->name, a->argv[4]))) {
+		if ((cur = find_table(NULL, a->argv[4]))) {
 			struct columns *col;
 			ast_cli(a->fd, "Columns for Table Cache '%s':\n", a->argv[4]);
 			ast_cli(a->fd, "%-20.20s %-20.20s %-3.3s %-8.8s\n", "Name", "Type", "Len", "Nullable");