QUICKFIX - don't enable all els when save fails

Change-Id: If4b0c16d9f2b2e92d423474f36cca89aaf5e239b