diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp
index 7541bb33e..a5e14797f 100644
--- a/library/modules/Buildings.cpp
+++ b/library/modules/Buildings.cpp
@@ -72,24 +72,36 @@ Buildings::Buildings(DFContextShared * d_)
     d = new Private;
     d->d = d_;
     d->owner = d_->p;
+    d->p_bld = NULL;
     d->Inited = d->Started = d->hasCustomWorkshops = false;
     VersionInfo * mem = d->d->offset_descriptor;
     OffsetGroup * OG_build = mem->getGroup("Buildings");
-    d->buildings_vector = OG_build->getAddress ("buildings_vector");
+    d->Inited = true;
     try
     {
-        d->custom_workshop_vector = OG_build->getAddress("custom_workshop_vector");
-        d->building_custom_workshop_type = OG_build->getOffset("building_custom_workshop_type");
-        d->custom_workshop_type = OG_build->getOffset("custom_workshop_type");
-        d->custom_workshop_name = OG_build->getOffset("custom_workshop_name");
-        mem->resolveClassnameToClassID("building_custom_workshop", d->custom_workshop_id);
-        d->hasCustomWorkshops = true;
+        d->buildings_vector = OG_build->getAddress ("buildings_vector");
     }
     catch(DFHack::Error::AllMemdef &e)
     {
-        cerr << "Custom workshops not available. Memory Definition: " << e.what() << endl;
+        cerr << "Buildings not available... " << e.what() << endl;
+        d->Inited = false;
+    }
+    if(d->Inited)
+    {
+        try
+        {
+            d->custom_workshop_vector = OG_build->getAddress("custom_workshop_vector");
+            d->building_custom_workshop_type = OG_build->getOffset("building_custom_workshop_type");
+            d->custom_workshop_type = OG_build->getOffset("custom_workshop_type");
+            d->custom_workshop_name = OG_build->getOffset("custom_workshop_name");
+            mem->resolveClassnameToClassID("building_custom_workshop", d->custom_workshop_id);
+            d->hasCustomWorkshops = true;
+        }
+        catch(DFHack::Error::AllMemdef &e)
+        {
+            cerr << "Custom workshops not available. Memory Definition: " << e.what() << endl;
+        }
     }
-    d->Inited = true;
 }
 
 Buildings::~Buildings()
@@ -101,6 +113,8 @@ Buildings::~Buildings()
 
 bool Buildings::Start(uint32_t & numbuildings)
 {
+    if(!d->Inited)
+        return false;
     d->p_bld = new DfVector <uint32_t> (d->owner, d->buildings_vector);
     numbuildings = d->p_bld->size();
     d->Started = true;
diff --git a/library/modules/Creatures.cpp b/library/modules/Creatures.cpp
index 39e734355..27bc320db 100644
--- a/library/modules/Creatures.cpp
+++ b/library/modules/Creatures.cpp
@@ -72,6 +72,7 @@ Creatures::Creatures(DFContextShared* _d)
     d->owner = _d->p;
     d->Inited = false;
     d->Started = false;
+    d->p_cre = NULL;
     d->d->InitReadNames(); // throws on error
     VersionInfo * minfo = d->d->offset_descriptor;
     OffsetGroup *OG_Creatures = minfo->getGroup("Creatures");
@@ -149,10 +150,14 @@ Creatures::~Creatures()
 
 bool Creatures::Start( uint32_t &numcreatures )
 {
-    d->p_cre = new DfVector <uint32_t> (d->owner, d->creatures.vector);
-    d->Started = true;
-    numcreatures =  d->p_cre->size();
-    return true;
+    if(d->Ft_basic)
+    {
+        d->p_cre = new DfVector <uint32_t> (d->owner, d->creatures.vector);
+        d->Started = true;
+        numcreatures =  d->p_cre->size();
+        return true;
+    }
+    return false;
 }
 
 bool Creatures::Finish()