fix for npe on some missing cli args, catalog to use new config properties