diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index 3418938d955..3610e6fb460 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -326,7 +326,7 @@
 #define INVESTIGATE_BOMB "bombs"
 
 // The SQL version required by this version of the code
-#define SQL_VERSION 6
+#define SQL_VERSION 8
 
 // Vending machine stuff
 #define CAT_NORMAL 1
diff --git a/code/controllers/subsystem/afk.dm b/code/controllers/subsystem/afk.dm
index f14eb72515e..9f409fd35b4 100644
--- a/code/controllers/subsystem/afk.dm
+++ b/code/controllers/subsystem/afk.dm
@@ -21,7 +21,7 @@ SUBSYSTEM_DEF(afk)
 		var/turf/T 
 		// Only players and players with the AFK watch enabled
 		// No dead, unconcious, restrained, people without jobs, people on other Z levels than the station or antags
-		if(H.client == null || !H.client.prefs.afk_watch || !H.mind || \
+		if(!H.client || !H.client.prefs.afk_watch || !H.mind || \
 			H.stat || H.restrained() || !H.job || H.mind.special_role || \
 				!is_station_level((T = get_turf(H)).z)) // Assign the turf as last. Small optimization
 			if(afk_players[H.ckey])