diff --git a/Server/Components/LegacyNetwork/legacy_network_impl.cpp b/Server/Components/LegacyNetwork/legacy_network_impl.cpp
index f9fd16a35..3cbe91088 100644
--- a/Server/Components/LegacyNetwork/legacy_network_impl.cpp
+++ b/Server/Components/LegacyNetwork/legacy_network_impl.cpp
@@ -429,6 +429,7 @@ void RakNetLegacyNetwork::OnPlayerConnect(RakNet::RPCParameters* rpcParams, void
 
 		network->core->logLn(LogLevel::Warning, "Invalid client connecting from %.*s", int(addressString.length()), addressString.data());
 		network->rakNetServer.Kick(rpcParams->sender);
+		network->rakNetServer.AddToBanList(addressString.data(), 15'000u);
 		return;
 	}
 
diff --git a/Server/Components/NPCs/npcs_impl.cpp b/Server/Components/NPCs/npcs_impl.cpp
index 43a7c7160..7364d9f28 100644
--- a/Server/Components/NPCs/npcs_impl.cpp
+++ b/Server/Components/NPCs/npcs_impl.cpp
@@ -27,8 +27,11 @@ void NPCComponent::onInit(IComponentList* components)
 		objects = components->queryComponent<IObjectsComponent>();
 		actors = components->queryComponent<IActorsComponent>();
 
-		vehicles->getPoolEventDispatcher().addEventHandler(this);
-		vehicles->getEventDispatcher().addEventHandler(this);
+		if (vehicles != nullptr)
+		{
+			vehicles->getPoolEventDispatcher().addEventHandler(this);
+			vehicles->getEventDispatcher().addEventHandler(this);
+		}
 	}
 }
 
diff --git a/lib/RakNet b/lib/RakNet
index 417077754..f1d225dbc 160000
--- a/lib/RakNet
+++ b/lib/RakNet
@@ -1 +1 @@
-Subproject commit 417077754bed5c23c38d64fb39c5a629790c091b
+Subproject commit f1d225dbcbdd0cff32eb535d94317ebcff81abed