diff --git a/Changes.md b/Changes.md
index 005da9cfb71..acab6e1dce1 100644
--- a/Changes.md
+++ b/Changes.md
@@ -8,6 +8,7 @@ Fixes
 - Widget : Fixed `event.sourceWidget` for DragDropEvents generated from a Qt native drag within the same Gaffer process. This will now reference the `GafferUI.Widget` that the Qt source widget belongs to, if any.
 - Catalogue : Fixed bug which "stole" drags that crossed the image listing but which were destined elsewhere, for instance a drag from the HierarchyView to a PathFilter in the GraphEditor.
 - GadgetWidget : Fixed signal handling bug in `setViewportGadget()`. This could cause the widget to attempt to redraw unnecessarily when the _old_ viewport requested a redraw.
+- RandomChoice : Fixed errors right-clicking on non-value plugs in the NodeEditor.
 
 1.4.15.2 (relative to 1.4.15.1)
 ========
diff --git a/python/GafferUI/RandomChoiceUI.py b/python/GafferUI/RandomChoiceUI.py
index 0a4704cbac7..3eb4f0bd4ae 100644
--- a/python/GafferUI/RandomChoiceUI.py
+++ b/python/GafferUI/RandomChoiceUI.py
@@ -240,6 +240,8 @@ def __popupMenu( menuDefinition, plugValueWidget ) :
 		return
 
 	for plug in plugValueWidget.getPlugs() :
+		if not isinstance( plug, Gaffer.ValuePlug ) :
+			return
 		if plug.getInput() is not None or Gaffer.MetadataAlgo.readOnly( plug ) :
 			return
 		if not Gaffer.RandomChoice.canSetup( plug ) :