diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 0fa52f5fc..000000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AnalysisUIOptions">
-    <option name="ANALYZE_INJECTED_CODE" value="false" />
-  </component>
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="openrocket:jar" />
-    </artifacts-to-build>
-  </component>
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Interface" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="GitSEFilterConfiguration">
-    <file-type-list>
-      <filtered-out-file-type name="LOCAL_BRANCH" />
-      <filtered-out-file-type name="REMOTE_BRANCH" />
-      <filtered-out-file-type name="TAG" />
-      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
-    </file-type-list>
-  </component>
-  <component name="HighlightingSettingsPerFile">
-    <setting file="file://$PROJECT_DIR$/core/resources/l10n/messages.properties" root0="SKIP_INSPECTION" />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProblemsViewState">
-    <option name="selectedTabId" value="CurrentFile" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="RunManager" selected="Application.SwingStartup">
-    <configuration name="jar" type="AntRunConfiguration">
-      <antsettings antfile="file://$PROJECT_DIR$/build.xml" target="jar">
-        <property name="source" value="17" />
-        <property name="target" value="17" />
-      </antsettings>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="SwingStartup" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="ALTERNATIVE_JRE_PATH" value="17" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-      <option name="MAIN_CLASS_NAME" value="net.sf.openrocket.startup.SwingStartup" />
-      <module name="OpenRocket Swing" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="net.sf.openrocket.startup.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <list>
-      <item itemvalue="Ant Target.jar" />
-      <item itemvalue="Application.SwingStartup" />
-      <item itemvalue="JAR Application.Openrocket UI Jar" />
-      <item itemvalue="JUnit.All tests" />
-    </list>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Application.SwingStartup" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-    <changelist id="2ecf826f-1227-4870-b9d4-17215cf24a1b" name="Changes" comment="Fix transition config layout" />
-    <created>1625095153807</created>
-    <option name="number" value="Default" />
-    <option name="presentableId" value="Default" />
-    <updated>1625095153807</updated>
-  </component>
-</project>
\ No newline at end of file
diff --git a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java
index 513f16391..413e99b23 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java
@@ -375,6 +375,9 @@ public class Rocket extends ComponentAssembly {
 		copyRocket.stageMap = new ConcurrentHashMap<>();
 		for( Map.Entry<Integer,AxialStage> entry : this.stageMap.entrySet()){
 			final AxialStage stage = (AxialStage)copyRocket.findComponent(entry.getValue().getID());
+			if (stage == null) {
+				throw new IllegalStateException("Stage not found in copy");
+			}
 			copyRocket.stageMap.put(entry.getKey(), stage);
 		}
 
diff --git a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
index 01b5b6820..b4a4b91e2 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
@@ -408,7 +408,8 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 			checkState();
 			RocketComponent clone;
 			try {
-				clone = (RocketComponent) this.clone();
+				clone = this.clone();
+				clone.id = this.id;
 			} catch (CloneNotSupportedException e) {
 				throw new BugException("CloneNotSupportedException encountered, report a bug!", e);
 			}