Index: trunk/MagicSoft/Mars/msimcamera/MSimAPD.cc
===================================================================
--- trunk/MagicSoft/Mars/msimcamera/MSimAPD.cc	(revision 9349)
+++ trunk/MagicSoft/Mars/msimcamera/MSimAPD.cc	(revision 9356)
@@ -100,7 +100,10 @@
         *fLog << inf << fNameGeomCam << " [MGeomCam] not found..." << endl;
 
-        fGeom = (MGeomCam*)pList->FindCreateObj(fNameGeomCam);
+        fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
         if (!fGeom)
+        {
+            *fLog << err << "MGeomCam not found... aborting." << endl;
             return kFALSE;
+        }
     }
 
Index: trunk/MagicSoft/Mars/msimcamera/MSimGeomCam.cc
===================================================================
--- trunk/MagicSoft/Mars/msimcamera/MSimGeomCam.cc	(revision 9349)
+++ trunk/MagicSoft/Mars/msimcamera/MSimGeomCam.cc	(revision 9356)
@@ -91,7 +91,10 @@
         *fLog << inf << fNameGeomCam << " [MGeomCam] not found..." << endl;
 
-        fGeom = (MGeomCam*)pList->FindCreateObj(fNameGeomCam);
+        fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
         if (!fGeom)
+        {
+            *fLog << err << "MGeomCam not found... aborting." << endl;
             return kFALSE;
+        }
     }
 
Index: trunk/MagicSoft/Mars/msimcamera/MSimRandomPhotons.cc
===================================================================
--- trunk/MagicSoft/Mars/msimcamera/MSimRandomPhotons.cc	(revision 9349)
+++ trunk/MagicSoft/Mars/msimcamera/MSimRandomPhotons.cc	(revision 9356)
@@ -91,7 +91,10 @@
         *fLog << inf << fNameGeomCam << " [MGeomCam] not found..." << endl;
 
-        fGeom = (MGeomCam*)pList->FindCreateObj(fNameGeomCam);
+        fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
         if (!fGeom)
+        {
+            *fLog << err << "MGeomCam not found... aborting." << endl;
             return kFALSE;
+        }
     }
 
@@ -175,5 +178,5 @@
             // Add a new photon
             // FIXME: SLOW!
-            MPhotonData &ph = fEvt->Add(); 
+            MPhotonData &ph = fEvt->Add();
 
             // Set source to NightSky, time to t and tag to pixel index