REFACTOR: Harden API for null args.