Only include context arg if not nil