update with less exceptions