Sync git svn branch with SVN repository r33144.

[simantics/platform.git] / bundles / org.simantics.project / src / org / simantics / project / management / ServerManagerFactory.java

diff --git a/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java b/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
index c34f9ef8019ec285bc68585467dcf81fc4c67791..3bde5dc422a4a2a810f32ba4f6faf67d101e0b6e 100644 (file)
--- a/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
+++ b/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
@@ -32,6 +32,8 @@ import org.simantics.utils.FileUtils;
 public class ServerManagerFactory {\r
     public static ServerManager create(String databaseId, String address) throws IOException, DatabaseException {\r
         Driver driver = Manager.getDriver(databaseId);\r
+        if (driver == null)\r
+            throw new IllegalArgumentException("Database driver for ID " + databaseId + " Could not be found!");\r
         System.out.println("ServerManagerFactory.create called with databaseId=" + databaseId + " and driver is " + driver.toString());\r
         DatabaseUserAgent agent = Manager.getUserAgent(databaseId);\r
         if (agent != null)\r
@@ -83,7 +85,7 @@ public class ServerManagerFactory {
                } catch (IllegalAccessException e) {\r
                        throw new RuntimeException(e);\r
                } catch (InvocationTargetException e) {\r
-                       throw new RuntimeException(e);\r
+                       throw new RuntimeException(e.getCause());\r
                }\r
        }\r
 \r