Updated params to return null rather than empty string if not set at all