diff --git a/src/main/java/burp/BurpExtender.java b/src/main/java/burp/BurpExtender.java
index 4bb6018..03cae1d 100644
--- a/src/main/java/burp/BurpExtender.java
+++ b/src/main/java/burp/BurpExtender.java
@@ -107,12 +107,10 @@ private void runScannerForRequest(IHttpRequestResponse iHttpRequestResponse) {
     public List<JMenuItem> createMenuItems(IContextMenuInvocation iContextMenuInvocation) {
         List<JMenuItem> items = new ArrayList<>();
 
-        if (IContextMenuInvocation.CONTEXT_TARGET_SITE_MAP_TABLE == iContextMenuInvocation.getInvocationContext() ||
-                IContextMenuInvocation.CONTEXT_TARGET_SITE_MAP_TREE == iContextMenuInvocation.getInvocationContext() ||
-                IContextMenuInvocation.CONTEXT_PROXY_HISTORY == iContextMenuInvocation.getInvocationContext()) {
-            IHttpRequestResponse[] arr = iContextMenuInvocation.getSelectedMessages();
+        IHttpRequestResponse[] selectedMessages = iContextMenuInvocation.getSelectedMessages();
+        if (selectedMessages != null && selectedMessages.length > 0) {
             JMenuItem item = new JMenuItem("Web Cache Deception Test");
-            MenuItemListener mil = new MenuItemListener(arr);
+            MenuItemListener mil = new MenuItemListener(selectedMessages);
             item.addActionListener(mil);
             items.add(item);
         }