Fixed bug discovered during SY plugin migration.

diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/TargetRuntime.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/TargetRuntime.java
index 702df09..da6620c 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/TargetRuntime.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/TargetRuntime.java

@@ -933,7 +933,6 @@
 			list.put(eClass,features);
 		}
 		for (Property p : med.getProperties()) {
-			EStructuralFeature feature = med.createEFeature(eClass, p);
 			if (bpmn2type instanceof EClass) {
 				// ignore structural features that are already defined in
 				// the BPMN2 package. These <property> elements are used
@@ -942,6 +941,7 @@
 				if (((EClass) bpmn2type).getEStructuralFeature(p.name)!=null)
 					continue;
 			}
+			EStructuralFeature feature = med.createEFeature(eClass, p);
 			if (feature!=null && !features.contains(feature))
 				features.add(feature);
 			for (Object v : p.getValues()) {

diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/FeatureSupport.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/FeatureSupport.java
index 03c7c97..2c50630 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/FeatureSupport.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/FeatureSupport.java

@@ -126,12 +126,14 @@
 	}
 
 	public static boolean isChoreographyParticipantBand(PictogramElement element) {
-		EObject container = element.eContainer();
-		if (container instanceof PictogramElement) {
-			PictogramElement containerElem = (PictogramElement) container;
-			Object bo = Graphiti.getLinkService().getBusinessObjectForLinkedPictogramElement(containerElem);
-			if (bo instanceof ChoreographyActivity) {
-				return true;
+		if (element!=null) {
+			EObject container = element.eContainer();
+			if (container instanceof PictogramElement) {
+				PictogramElement containerElem = (PictogramElement) container;
+				Object bo = Graphiti.getLinkService().getBusinessObjectForLinkedPictogramElement(containerElem);
+				if (bo instanceof ChoreographyActivity) {
+					return true;
+				}
 			}
 		}
 		return false;