diff --git a/lib/controller/handler.py b/lib/controller/handler.py
index 20c29e133..da0564127 100644
--- a/lib/controller/handler.py
+++ b/lib/controller/handler.py
@@ -85,11 +85,15 @@ def setHandler():
             conf.timeout = 10
 
             dialect = DBMS_DICT[name][3]
-            sqlalchemy = SQLAlchemy(dialect=dialect)
-            sqlalchemy.connect()
 
-            if sqlalchemy.connector:
-                conf.dbmsConnector = sqlalchemy
+            if dialect:
+                sqlalchemy = SQLAlchemy(dialect=dialect)
+                sqlalchemy.connect()
+
+                if sqlalchemy.connector:
+                    conf.dbmsConnector = sqlalchemy
+                else:
+                    conf.dbmsConnector.connect()
             else:
                 conf.dbmsConnector.connect()
 
diff --git a/lib/core/dicts.py b/lib/core/dicts.py
index 0e492f62c..f8578806e 100644
--- a/lib/core/dicts.py
+++ b/lib/core/dicts.py
@@ -138,7 +138,7 @@ DBMS_DICT = {
                 DBMS.MAXDB: (MAXDB_ALIASES, None, None, "maxdb"),
                 DBMS.SYBASE: (SYBASE_ALIASES, "python-pymssql", "http://pymssql.sourceforge.net/", "sybase"),
                 DBMS.DB2: (DB2_ALIASES, "python ibm-db", "http://code.google.com/p/ibm-db/", "ibm_db_sa"),
-                DBMS.HSQLDB: (HSQLDB_ALIASES, "python jaydebeapi", "https://pypi.python.org/pypi/JayDeBeApi/", "hsqldb"),
+                DBMS.HSQLDB: (HSQLDB_ALIASES, "python jaydebeapi", "https://pypi.python.org/pypi/JayDeBeApi/", None),
             }
 
 FROM_DUMMY_TABLE = {