diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPDataSource.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPDataSource.java
index 2c808e385c472028acb84ccd9448ed4a75a7bd1e..164da94c203ebc1dbb9aec8f6d32ebfe3e5a0e06 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPDataSource.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPDataSource.java
@@ -47,6 +47,7 @@ public interface DBPDataSource extends DBCExecutionContext
      * at the moment of invocation of this function.
      * @return datasource info.
      */
+    @NotNull
     DBPDataSourceInfo getInfo();
 
     /**
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSource.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSource.java
index 5660ece77c8a327bdc502dc45d5b0dd892a36b90..f835ba13e1a7152c1a1361291fe0440355a81dc7 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSource.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSource.java
@@ -216,6 +216,7 @@ public abstract class JDBCDataSource
         return container;
     }
 
+    @NotNull
     @Override
     public DBPDataSourceInfo getInfo()
     {
diff --git a/plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/model/WMIDataSource.java b/plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/model/WMIDataSource.java
index 8783459922ecd438ae3d1569a087644f6f4ed7f6..538e8e44909ff61a1eb3451dc9b99432be2a7e59 100644
--- a/plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/model/WMIDataSource.java
+++ b/plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/model/WMIDataSource.java
@@ -62,6 +62,7 @@ public class WMIDataSource implements DBPDataSource, SQLDataSource, IAdaptable//
         return container;
     }
 
+    @NotNull
     @Override
     public DBPDataSourceInfo getInfo()
     {