Fix case where id doesn't exist