diff --git a/src/common/filesystem.c b/src/common/filesystem.c
index 8a45102a..39370dc2 100644
--- a/src/common/filesystem.c
+++ b/src/common/filesystem.c
@@ -375,7 +375,7 @@ FS_PackQuickSearch(const fsPack_t *pak, const char *name)
 	int start, end;
 
 	start = 0;
-	end = pak->numFiles;
+	end = pak->numFiles - 1;
 
 	while (start <= end)
 	{
diff --git a/src/server/sv_main.c b/src/server/sv_main.c
index c0f52cbe..2b236dd8 100644
--- a/src/server/sv_main.c
+++ b/src/server/sv_main.c
@@ -688,6 +688,9 @@ SV_Shutdown(char *finalmsg, qboolean reconnect)
 	memset(&sv, 0, sizeof(sv));
 	Com_SetServerState(sv.state);
 
+	/* No old connect for sure */
+	sv_client = NULL;
+
 	/* free server static data */
 	if (svs.clients)
 	{