1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConfigureMessageEventCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConfigureMessageEventCommand.java
index cff1416e517..b6fd2014db3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConfigureMessageEventCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConfigureMessageEventCommand.java
@@ -354,6 +354,9 @@ public class ConfigureMessageEventCommand extends ConfigureElementCommand {
 		// Remove the created message ends
 		if (null != createdMessageEnds && !createdMessageEnds.isEmpty()) {
 			for (final MessageEnd createdMessage : createdMessageEnds) {
+				if (createdMessage == null) {
+					continue;
+				}
 				final EObject container = createdMessage.eContainer();
 				if (container instanceof Interaction) {
 					((Interaction) container).getFragments().remove(createdMessage);