diff --git a/samples/sample-databases/cloudbeaver-sample.conf b/samples/sample-databases/cloudbeaver-sample.conf
index 6a596a773f..c088199f12 100644
--- a/samples/sample-databases/cloudbeaver-sample.conf
+++ b/samples/sample-databases/cloudbeaver-sample.conf
@@ -19,6 +19,9 @@
         database: {
             driver="h2_embedded",
             url: "jdbc:h2:${workspace}/.data/cb.h2.dat",
+            // For embedded database it will be the primary user name/password
+            user: "cb-data",
+            password: "cb-data",
 
             createDatabase: true,
 
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/WebServiceBindingBase.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/WebServiceBindingBase.java
index a682a1cc87..adddcf8767 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/WebServiceBindingBase.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/WebServiceBindingBase.java
@@ -31,6 +31,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
@@ -100,7 +101,11 @@ public abstract class WebServiceBindingBase<API_TYPE extends DBWService> impleme
 
         @Override
         public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-            return method.invoke(impl, args);
+            try {
+                return method.invoke(impl, args);
+            } catch (InvocationTargetException e) {
+                throw e.getTargetException();
+            }
         }
     }
 }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java
index 7e0603e580..853991dffd 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java
@@ -72,7 +72,7 @@ public class WebServiceNavigator implements DBWServiceNavigator {
             }
             return  result;
         } catch (DBException e) {
-            throw new DBWebException("Error getting navigator nodes", e);
+            throw new DBWebException(e, null);
         }
     }