diff --git a/src/osgPlugins/osgTerrain/ReaderWriterOsgTerrain.cpp b/src/osgPlugins/osgTerrain/ReaderWriterOsgTerrain.cpp
index a01d7a87e..ab3098f05 100644
--- a/src/osgPlugins/osgTerrain/ReaderWriterOsgTerrain.cpp
+++ b/src/osgPlugins/osgTerrain/ReaderWriterOsgTerrain.cpp
@@ -45,7 +45,7 @@ class ReaderWriterTerrain : public osgDB::ReaderWriter
                     osg::notify(osg::NOTICE)<<"["<<itr->first<<"] = "<<"["<<itr->second<<"]"<<std::endl;
                 }
 #else
-                std::istringstream fin(file);
+                std::istringstream fin(osgDB::getNameLessExtension(file));
                 if (fin) return readNode(fin,opt);
 #endif
                 return 0;
diff --git a/src/osgTerrain/GeometryTechnique.cpp b/src/osgTerrain/GeometryTechnique.cpp
index 64353cf42..9bf306d34 100644
--- a/src/osgTerrain/GeometryTechnique.cpp
+++ b/src/osgTerrain/GeometryTechnique.cpp
@@ -145,6 +145,8 @@ Locator* GeometryTechnique::computeMasterLocator()
 
 osg::Vec3d GeometryTechnique::computeCenterModel(Locator* masterLocator)
 {
+    if (!masterLocator) return osg::Vec3d(0.0,0.0,0.0);
+
     BufferData& buffer = getWriteBuffer();
     
     osgTerrain::Layer* elevationLayer = _terrain->getElevationLayer();