diff --git a/QSB/QuantumSync/Patches/QuantumPatches.cs b/QSB/QuantumSync/Patches/QuantumPatches.cs
index 4a0a44a6..5f41674e 100644
--- a/QSB/QuantumSync/Patches/QuantumPatches.cs
+++ b/QSB/QuantumSync/Patches/QuantumPatches.cs
@@ -5,7 +5,6 @@ using QSB.Player;
 using QSB.QuantumSync.WorldObjects;
 using QSB.Utility;
 using QSB.WorldSync;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
diff --git a/QSB/QuantumSync/WorldObjects/QSBQuantumState.cs b/QSB/QuantumSync/WorldObjects/QSBQuantumState.cs
index e4fe6f12..4461b5a2 100644
--- a/QSB/QuantumSync/WorldObjects/QSBQuantumState.cs
+++ b/QSB/QuantumSync/WorldObjects/QSBQuantumState.cs
@@ -2,7 +2,7 @@
 
 namespace QSB.QuantumSync.WorldObjects
 {
-	class QSBQuantumState : WorldObject<QuantumState>
+	internal class QSBQuantumState : WorldObject<QuantumState>
 	{
 		public bool IsMeantToBeEnabled;
 
diff --git a/QSB/WorldSync/QSBWorldSync.cs b/QSB/WorldSync/QSBWorldSync.cs
index 3ac72a81..8820e0e9 100644
--- a/QSB/WorldSync/QSBWorldSync.cs
+++ b/QSB/WorldSync/QSBWorldSync.cs
@@ -42,7 +42,14 @@ namespace QSB.WorldSync
 		public static TWorldObject GetWorldFromUnity<TWorldObject, TUnityObject>(TUnityObject unityObject)
 			where TWorldObject : WorldObject<TUnityObject>
 			where TUnityObject : MonoBehaviour
-			=> WorldObjectsToUnityObjects[unityObject] as TWorldObject;
+		{
+			if (!WorldObjectsToUnityObjects.ContainsKey(unityObject))
+			{
+				DebugLog.DebugWrite($"Error - WorldObjectsToUnityObjects does not contain \"{unityObject.name}\"!", MessageType.Error);
+				return default;
+			}
+			return WorldObjectsToUnityObjects[unityObject] as TWorldObject;
+		}
 
 		public static int GetIdFromUnity<TWorldObject, TUnityObject>(TUnityObject unityObject)
 			where TWorldObject : WorldObject<TUnityObject>
@@ -71,7 +78,7 @@ namespace QSB.WorldSync
 				}
 				catch (Exception e)
 				{
-					DebugLog.ToConsole($"Error - Exception in OnRemoval() for {item.GetType()}. Message : {e.Message}, Stack trace : {e.StackTrace}", MessageType.Error);
+					DebugLog.ToConsole($"Error - Exception in OnRemoval() for {item.GetType()}. Message : {e.InnerException.Message}, Stack trace : {e.InnerException.StackTrace}", MessageType.Error);
 				}
 			}
 			DebugLog.DebugWrite($"Removing {typeof(TWorldObject).Name} : {WorldObjects.Count(x => x is TWorldObject)} instances.");