Fixed 'Bug 15218 - Saving causing a crash'