diff --git a/src/CDF/CDF_FWOSDriver.cxx b/src/CDF/CDF_FWOSDriver.cxx
index a8c84c3263..b555fdab34 100644
--- a/src/CDF/CDF_FWOSDriver.cxx
+++ b/src/CDF/CDF_FWOSDriver.cxx
@@ -180,7 +180,7 @@ TCollection_ExtendedString CDF_FWOSDriver::DefaultFolder()
     else {
       theDefaultFolder=UTL::xgetenv("TEMP");
       if(theDefaultFolder.Length()==0)
-        throw Standard_Failure("cannot determine default folder; HOMEDRIVE and TEMP are undefined");
+        theDefaultFolder = ".";
     }
 #else
     TCollection_ExtendedString home=UTL::xgetenv("HOME");
diff --git a/src/CDF/CDF_Store.cxx b/src/CDF/CDF_Store.cxx
index 74baa5e148..60c780bf70 100644
--- a/src/CDF/CDF_Store.cxx
+++ b/src/CDF/CDF_Store.cxx
@@ -46,10 +46,7 @@ void CDF_Store::Init() {
   myCurrentDocument = myMainDocument;
   myList = new CDF_StoreList(myCurrentDocument);
 
-  myIsMainDocument = Standard_True;
-  FindDefault();
-
-// getting the subcomponents.
+  // getting the subcomponents.
   //
   myIsMainDocument = Standard_False;
   myList->Init();