Issue #2353495 by Berdir, drunken monkey: Fixed fatal errors when original object can't be loaded.