diff --git a/apps/opencs/model/tools/birthsigncheck.cpp b/apps/opencs/model/tools/birthsigncheck.cpp
index b673c93de..59c65086e 100644
--- a/apps/opencs/model/tools/birthsigncheck.cpp
+++ b/apps/opencs/model/tools/birthsigncheck.cpp
@@ -19,7 +19,12 @@ int CSMTools::BirthsignCheckStage::setup()
 
 void CSMTools::BirthsignCheckStage::perform (int stage, std::vector<std::string>& messages)
 {
-    const ESM::BirthSign& birthsign = mBirthsigns.getRecord (stage).get();
+    const CSMWorld::Record<ESM::BirthSign>& record = mBirthsigns.getRecord (stage);
+
+    if (record.isDeleted())
+        return;
+
+    const ESM::BirthSign& birthsign = record.get();
 
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Birthsign, birthsign.mId);
 
diff --git a/apps/opencs/model/tools/classcheck.cpp b/apps/opencs/model/tools/classcheck.cpp
index da2e9f19a..6923b3153 100644
--- a/apps/opencs/model/tools/classcheck.cpp
+++ b/apps/opencs/model/tools/classcheck.cpp
@@ -20,7 +20,12 @@ int CSMTools::ClassCheckStage::setup()
 
 void CSMTools::ClassCheckStage::perform (int stage, std::vector<std::string>& messages)
 {
-    const ESM::Class& class_= mClasses.getRecord (stage).get();
+    const CSMWorld::Record<ESM::Class>& record = mClasses.getRecord (stage);
+
+    if (record.isDeleted())
+        return;
+
+    const ESM::Class& class_ = record.get();
 
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Class, class_.mId);
 
diff --git a/apps/opencs/model/tools/factioncheck.cpp b/apps/opencs/model/tools/factioncheck.cpp
index af26904ef..c219e5610 100644
--- a/apps/opencs/model/tools/factioncheck.cpp
+++ b/apps/opencs/model/tools/factioncheck.cpp
@@ -20,7 +20,12 @@ int CSMTools::FactionCheckStage::setup()
 
 void CSMTools::FactionCheckStage::perform (int stage, std::vector<std::string>& messages)
 {
-    const ESM::Faction& faction = mFactions.getRecord (stage).get();
+    const CSMWorld::Record<ESM::Faction>& record = mFactions.getRecord (stage);
+
+    if (record.isDeleted())
+        return;
+
+    const ESM::Faction& faction = record.get();
 
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Faction, faction.mId);
 
diff --git a/apps/opencs/model/tools/racecheck.cpp b/apps/opencs/model/tools/racecheck.cpp
index 1e7a4cab4..413de5ef0 100644
--- a/apps/opencs/model/tools/racecheck.cpp
+++ b/apps/opencs/model/tools/racecheck.cpp
@@ -9,7 +9,12 @@
 
 void CSMTools::RaceCheckStage::performPerRecord (int stage, std::vector<std::string>& messages)
 {
-    const ESM::Race& race = mRaces.getRecord (stage).get();
+    const CSMWorld::Record<ESM::Race>& record = mRaces.getRecord (stage);
+
+    if (record.isDeleted())
+        return;
+
+    const ESM::Race& race = record.get();
 
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Race, race.mId);
 
diff --git a/apps/opencs/model/tools/regioncheck.cpp b/apps/opencs/model/tools/regioncheck.cpp
index ac64ac027..4398e00ef 100644
--- a/apps/opencs/model/tools/regioncheck.cpp
+++ b/apps/opencs/model/tools/regioncheck.cpp
@@ -19,7 +19,12 @@ int CSMTools::RegionCheckStage::setup()
 
 void CSMTools::RegionCheckStage::perform (int stage, std::vector<std::string>& messages)
 {
-    const ESM::Region& region = mRegions.getRecord (stage).get();
+    const CSMWorld::Record<ESM::Region>& record = mRegions.getRecord (stage);
+
+    if (record.isDeleted())
+        return;
+
+    const ESM::Region& region = record.get();
 
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Region, region.mId);
 
diff --git a/apps/opencs/model/tools/skillcheck.cpp b/apps/opencs/model/tools/skillcheck.cpp
index 897aeab47..28fc24fd3 100644
--- a/apps/opencs/model/tools/skillcheck.cpp
+++ b/apps/opencs/model/tools/skillcheck.cpp
@@ -18,7 +18,12 @@ int CSMTools::SkillCheckStage::setup()
 
 void CSMTools::SkillCheckStage::perform (int stage, std::vector<std::string>& messages)
 {
-    const ESM::Skill& skill = mSkills.getRecord (stage).get();
+    const CSMWorld::Record<ESM::Skill>& record = mSkills.getRecord (stage);
+
+    if (record.isDeleted())
+        return;
+
+    const ESM::Skill& skill = record.get();
 
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Skill, skill.mId);
 
diff --git a/apps/opencs/model/tools/soundcheck.cpp b/apps/opencs/model/tools/soundcheck.cpp
index 52834e659..dce2d2b6f 100644
--- a/apps/opencs/model/tools/soundcheck.cpp
+++ b/apps/opencs/model/tools/soundcheck.cpp
@@ -18,7 +18,12 @@ int CSMTools::SoundCheckStage::setup()
 
 void CSMTools::SoundCheckStage::perform (int stage, std::vector<std::string>& messages)
 {
-    const ESM::Sound& sound = mSounds.getRecord (stage).get();
+    const CSMWorld::Record<ESM::Sound>& record = mSounds.getRecord (stage);
+
+    if (record.isDeleted())
+        return;
+
+    const ESM::Sound& sound = record.get();
 
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Sound, sound.mId);
 
diff --git a/apps/opencs/model/tools/spellcheck.cpp b/apps/opencs/model/tools/spellcheck.cpp
index 3adee0a4e..a2cc7c8d2 100644
--- a/apps/opencs/model/tools/spellcheck.cpp
+++ b/apps/opencs/model/tools/spellcheck.cpp
@@ -19,7 +19,12 @@ int CSMTools::SpellCheckStage::setup()
 
 void CSMTools::SpellCheckStage::perform (int stage, std::vector<std::string>& messages)
 {
-    const ESM::Spell& spell = mSpells.getRecord (stage).get();
+    const CSMWorld::Record<ESM::Spell>& record = mSpells.getRecord (stage);
+
+    if (record.isDeleted())
+        return;
+
+    const ESM::Spell& spell = record.get();
 
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Spell, spell.mId);