3 files changed, 14 insertions, 4 deletions
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index f7e5f9a842e4..f199353c2d7a 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -51,7 +51,7 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <xmlscript/xmldlg_imexp.hxx>
 #include <cppuhelper/factory.hxx>
 #include <svtools/sfxecode.hxx>
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index c397e402fac4..02a7b174da1c 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -54,7 +54,7 @@
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 #include <unotools/streamwrap.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 #include <basic/basmgr.hxx>
@@ -940,7 +940,17 @@ sal_Bool SfxLibraryContainer::init_Impl(
     // #110009
 
     if( !bStorage && meInitMode == DEFAULT )
-        implScanExtensions();
+    {
+        try
+        {
+            implScanExtensions();
+        }
+        catch( uno::Exception& )
+        {
+            // TODO: error handling?
+            OSL_ASSERT( "Cannot access extensions!" );
+        }
+    }
 
     // #110009 Preload?
     {
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index aad4815872c0..e72205744ce0 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -58,7 +58,7 @@
 #include <tools/urlobj.hxx>
 
 
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 #include <basic/basmgr.hxx>