issue #880 - undo model saves objects to keep + defensive programming