Fix NPE in listCatalogs#1949

eric-maynard merged 3 commits intoapache:mainapache/polaris:mainfrom

andrew4699:aguterman-filter-nullsandrew4699/polaris:aguterman-filter-nullsCopy head branch name to clipboard