Re-added checks + refactoring. ES not crashing but not saving