diff --git a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDataSource.java b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDataSource.java
index cbbf35ff42535be9dce5f7999bd8d5eb8c908a02..f7cb06ef48671a2daa533da4eb2f8f9b350b2a63 100644
--- a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDataSource.java
+++ b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDataSource.java
@@ -81,7 +81,10 @@ public class MySQLDataSource extends JDBCDataSource implements DBSObjectSelector
 
     protected void initializeContextState(DBRProgressMonitor monitor, JDBCExecutionContext context, boolean setActiveObject) throws DBCException {
         if (setActiveObject) {
-            useDatabase(monitor, context, getSelectedObject());
+            MySQLCatalog object = getSelectedObject();
+            if (object != null) {
+                useDatabase(monitor, context, object);
+            }
         }
     }
 
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/net/SSHTunnelImpl.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/net/SSHTunnelImpl.java
index 84c6452be54d8851655ee4c25b637a540d50ae07..ece2dce9ad953ca9acf78ed7218eb64278d71e36 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/net/SSHTunnelImpl.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/net/SSHTunnelImpl.java
@@ -249,7 +249,7 @@ public class SSHTunnelImpl implements DBWTunnel {
                     levelStr = "DEBUG";
                     break;
             }
-            log.debug(levelStr + ": " + message);
+            log.debug("SSH " + levelStr + ": " + message);
 
         }
     }