Improved handling of missing params.