diff --git a/lib/uno/embedded/documenthandler.py b/lib/uno/embedded/documenthandler.py
index a57d64ed..915158ef 100644
--- a/lib/uno/embedded/documenthandler.py
+++ b/lib/uno/embedded/documenthandler.py
@@ -51,9 +51,6 @@
 from .configuration import g_options
 from .configuration import g_shutdown
 
-from .configuration import g_errorlog
-from .configuration import g_basename
-
 import traceback
 
 
@@ -70,7 +67,6 @@ def __init__(self, ctx, lock, logger, url):
         self._listening = False
         self._path, self._name = self._getDataBaseInfo(url)
         self._url = url
-        self._errorlog = None
 
     @property
     def URL(self):
@@ -215,14 +211,14 @@ def _closeDataBase(self, document):
                     for name in target.getElementNames():
                         if not name.startswith(self._name):
                             target.removeElement(name)
-            empty = not source.hasElements()
             target.commit()
             target.dispose()
             source.dispose()
             document.store()
-            return empty
+            return True
         except Exception as e:
-            self._getErrorLog().logprb(SEVERE, 'DocumentHandler', '_closeDataBase()', 233, self._url, traceback.format_exc())
+            self._logger.logprb(SEVERE, 'DocumentHandler', '_closeDataBase()', 233, self._url, traceback.format_exc())
+            return False
 
     def _switchDataBase(self, document, storage, newname):
         try:
@@ -238,19 +234,14 @@ def _switchDataBase(self, document, storage, newname):
                         self._logger.logprb(INFO, 'DocumentHandler', '_switchDataBase()', 241, name)
                         self._moveStorage(source, target, name, newname)
                         self._logger.logprb(INFO, 'DocumentHandler', '_switchDataBase()', 242, name)
-            empty = not source.hasElements()
             target.commit()
             target.dispose()
             source.dispose()
             document.store()
-            return empty
+            return True
         except Exception as e:
-            self._getErrorLog().logprb(SEVERE, 'DocumentHandler', '_switchDataBase()', 243, self._url, traceback.format_exc())
-
-    def _getErrorLog(self):
-        if self._errorlog is None:
-            self._errorlog = getLogger(self._ctx, g_errorlog, g_basename)
-        return self._errorlog
+            self._logger.logprb(SEVERE, 'DocumentHandler', '_switchDataBase()', 243, self._url, traceback.format_exc())
+            return False
 
     # DocumentHandler private setter methods
     def _openDataBase(self, sf, source):
diff --git a/lib/uno/embedded/options/optionsmanager.py b/lib/uno/embedded/options/optionsmanager.py
index cd62f6ff..40f6befa 100644
--- a/lib/uno/embedded/options/optionsmanager.py
+++ b/lib/uno/embedded/options/optionsmanager.py
@@ -63,14 +63,12 @@ def __init__(self, ctx, window):
         self._disposed = False
         self._disabled = False
         self._model = OptionsModel(ctx)
-        print("OptionsManager.__init__() 1")
         window.addEventListener(OptionsListener(self))
         self._view = OptionsView(window, *self._model.getViewData())
         version  = ' '.join(sys.version.split())
         path = os.pathsep.join(sys.path)
         infos = {111: version, 112: path}
         self._logger = LogManager(ctx, window.getPeer(), infos, g_identifier, g_defaultlog)
-        print("OptionsManager.__init__() 2")
 
     def dispose(self):
         self._logger.dispose()
@@ -105,7 +103,6 @@ def loadSetting(self):
         self._view.initView(*self._model.loadSetting())
 
     def setDriverService(self, driver):
-        print("OptionsManager.setDriverService() ************************")
         self._view.setConnectionLevel(*self._model.setDriverService(driver))
 
     def setConnectionService(self, level):
diff --git a/lib/uno/embedded/options/optionsmodel.py b/lib/uno/embedded/options/optionsmodel.py
index d03e1859..4a82f894 100644
--- a/lib/uno/embedded/options/optionsmodel.py
+++ b/lib/uno/embedded/options/optionsmodel.py
@@ -117,20 +117,21 @@ def _getLevelValue(self, level):
         return '%d' % level
 
     def _getDriverVersion(self):
+        version = 'N/A'
         try:
             service = self._config.getByName('DriverService')
             driver = createService(self._ctx, service)
-            connection = driver.connect(self._url, ())
-            version = connection.getMetaData().getDriverVersion()
-            connection.close()
-            driver.dispose()
-            return version
+            # FIXME: If jdbcDriverOOo extension has not been installed then driver is None
+            if driver is not None:
+                connection = driver.connect(self._url, ())
+                version = connection.getMetaData().getDriverVersion()
+                connection.close()
+                driver.dispose()
         except UnoException as e:
-            print("OptionsModel._getDriverVersion() Error: %s" % e.Message)
-            logger = getLogger(self._ctx, g_defaultlog, g_basename)
-            logger.logprb(SEVERE, 'OptionsModel', '_getDriverVersion()', 141, e.Message)
+            self._getLogger().logprb(SEVERE, 'OptionsModel', '_getDriverVersion()', 141, e.Message)
         except Exception as e:
-            print("OptionsModel._getDriverVersion() Error: %s - Traceback: %s" % (e, traceback.format_exc()))
-            logger = getLogger(self._ctx, g_defaultlog, g_basename)
-            logger.logprb(SEVERE, 'OptionsModel', '_getDriverVersion()', 142, str(e), traceback.format_exc())
+            self._getLogger().logprb(SEVERE, 'OptionsModel', '_getDriverVersion()', 142, str(e), traceback.format_exc())
+        return version
 
+    def _getLogger(self):
+        return getLogger(self._ctx, g_defaultlog, g_basename)