Merge remote-tracking branch 'origin/devel' into devel

Former-commit-id: 5b1ef86b

plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/manage/LockManagerViewer.java

@@ -69,10 +69,12 @@ public class LockManagerViewer {
     private Action killAction = new Action("Kill waiting session", UIUtils.getShardImageDescriptor(ISharedImages.IMG_ELCL_STOP)) {
         @Override
         public void run() {
-            DBAServerLock<?> root = graphManager.getGraph(curLock).getLockRoot();
-            alterSession();
-            refreshLocks(root);
-            setTableLockSelect(root);
+        	if (curLock != null) {
+                DBAServerLock<?> root = graphManager.getGraph(curLock).getLockRoot();
+                alterSession();
+                refreshLocks(root);
+                setTableLockSelect(root);        		
+        	}
         }
     };