Minor update to pass id or throw an error for demo purpose