diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index ab6bb4818bc2..4b979921dbf5 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -149,19 +149,12 @@ IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl, Button*, void)
     ScopedVclPtrInstance< SetDefaultLanguageDialog > aDlg( this, m_xLocalizationMgr );
     if ( RET_OK == aDlg->Execute() )
     {
-        if (!m_xLocalizationMgr->isLibraryLocalized())
-        {
-            SAL_WARN("basctl.basicide", "Adding langs to non-localized library tdf#93077");
-        }
-        else
-        {
-            // add new locales
-            Sequence< Locale > aLocaleSeq = aDlg->GetLocales();
-            m_xLocalizationMgr->handleAddLocales( aLocaleSeq );
-            // update listbox
-            ClearLanguageBox();
-            FillLanguageBox();
-        }
+        // add new locales
+        Sequence< Locale > aLocaleSeq = aDlg->GetLocales();
+        m_xLocalizationMgr->handleAddLocales( aLocaleSeq );
+        // update listbox
+        ClearLanguageBox();
+        FillLanguageBox();
 
         if (SfxBindings* pBindings = GetBindingsPtr())
             pBindings->Invalidate( SID_BASICIDE_CURRENT_LANG );
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 5d5b45054d4d..fb90243ebaa2 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -379,7 +379,11 @@ Reference< css::resource::XStringResourcePersistence >
         }
         catch(const uno::Exception& )
         {
-            // TODO: Error handling?
+            // Something went wrong while trying to get the storage library.
+            // Return an object that supports StringResourceWithStorage, give it a storage location later.
+            xRet = Reference< resource::XStringResourcePersistence >(
+              mxContext->getServiceManager()->createInstanceWithContext("com.sun.star.resource.StringResourceWithStorage", mxContext),
+              UNO_QUERY );
             return xRet;
         }