diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/manage/LockManagerViewer.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/manage/LockManagerViewer.java
index 7685eac15f2f44e1e14328cc354ab9582036e56f..80957b3d779342727faa4c62d8f2f065fb1a329d 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/manage/LockManagerViewer.java
+++ b/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);        		
+        	}
         }
     };