diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/InputEventCellEditor.java b/AlgebraicDataflowArchitectureModel/src/application/editor/InputEventCellEditor.java
index 91f1dae..bad12b2 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/editor/InputEventCellEditor.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/editor/InputEventCellEditor.java
@@ -131,6 +131,9 @@
 				}
 			}
 			    
+			if(messages.isEmpty()) {
+				return;
+			}
 			String[] eventList = messages.toArray(new String[messages.size()]);
 			JComboBox<String> event = new JComboBox<String>(eventList);