diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs
index aeae753655..f33b70116f 100644
--- a/Content.Client/EntryPoint.cs
+++ b/Content.Client/EntryPoint.cs
@@ -194,13 +194,13 @@ namespace Content.Client
             IoCManager.Resolve<IChatManager>().Initialize();
         }
 
-        public override void Update(AssemblyLoader.UpdateLevel level, float frameTime)
+        public override void Update(ModUpdateLevel level, float frameTime)
         {
             base.Update(level, frameTime);
 
             switch (level)
             {
-                case AssemblyLoader.UpdateLevel.FramePreEngine:
+                case ModUpdateLevel.FramePreEngine:
                     var renderFrameEventArgs = new RenderFrameEventArgs(frameTime);
                     IoCManager.Resolve<IClientNotifyManager>().FrameUpdate(renderFrameEventArgs);
                     IoCManager.Resolve<IClientGameTicker>().FrameUpdate(renderFrameEventArgs);
diff --git a/Content.IntegrationTests/StartTest.cs b/Content.IntegrationTests/StartTest.cs
index 8edc3b5437..2906099bfa 100644
--- a/Content.IntegrationTests/StartTest.cs
+++ b/Content.IntegrationTests/StartTest.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using Robust.Shared.Exceptions;
-using Robust.Shared.Utility;
 using Robust.UnitTesting;
 
 namespace Content.IntegrationTests
@@ -28,6 +25,26 @@ namespace Content.IntegrationTests
             server.Stop();
             await server.WaitIdleAsync();
             Assert.That(!server.IsAlive);
+            Assert.That(server.UnhandledException, Is.Null);
+        }
+
+        /// <summary>
+        ///     Test that the client starts.
+        /// </summary>
+        [Test]
+        public async Task TestClientStart()
+        {
+            var client = StartClient();
+            await client.WaitIdleAsync();
+            Assert.That(client.IsAlive);
+            client.RunTicks(5);
+            await client.WaitIdleAsync();
+            Assert.That(client.IsAlive);
+            var runtimeLog = client.ResolveDependency<IRuntimeLog>();
+            Assert.That(runtimeLog.ExceptionCount, Is.EqualTo(0), "No exceptions must be logged.");
+            client.Stop();
+            await client.WaitIdleAsync();
+            Assert.That(!client.IsAlive);
         }
     }
 }
diff --git a/Content.Server/EntryPoint.cs b/Content.Server/EntryPoint.cs
index 7e08028eb0..46cf2c90f3 100644
--- a/Content.Server/EntryPoint.cs
+++ b/Content.Server/EntryPoint.cs
@@ -210,7 +210,7 @@ namespace Content.Server
             _gameTicker.Initialize();
         }
 
-        public override void Update(AssemblyLoader.UpdateLevel level, float frameTime)
+        public override void Update(ModUpdateLevel level, float frameTime)
         {
             base.Update(level, frameTime);
 
diff --git a/RobustToolbox b/RobustToolbox
index 99c956dfb4..1c2caca7e1 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 99c956dfb45bcfb12e2408299498fabea3518a03
+Subproject commit 1c2caca7e1a0a028ee666aa8caa50c3b0d8b139a