better null param handling