Handle invalid versions better in ObjectStore update code