[642] Better handling of errors and existing items