diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index 6e489098c29..f2e72125a1b 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -346,7 +346,7 @@
 #define INVESTIGATE_BOMB "bombs"
 
 // The SQL version required by this version of the code
-#define SQL_VERSION 3
+#define SQL_VERSION 4
 
 // Vending machine stuff
 #define CAT_NORMAL 1
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index 95afa6244d3..8628e6957cf 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -266,12 +266,12 @@ This is always put in the attack log.
 
 	var/loglevel = ATKLOG_MOST
 
-	if(custom_level)
+	if(!isnull(custom_level))
 		loglevel = custom_level
 	else if(istype(target))
 		if(isLivingSSD(target))  // Attacks on SSDs are shown to admins with any log level except ATKLOG_NONE
 			loglevel = ATKLOG_FEW
-		else if(!user.ckey && !target.ckey) // Attacks between NPCs are only shown to admins with ATKLOG_ALL
+		else if(istype(user) && !user.ckey && !target.ckey) // Attacks between NPCs are only shown to admins with ATKLOG_ALL
 			loglevel = ATKLOG_ALL
 		else if(!target.ckey) // Attacks by players on NPCs are only shown to admins with ATKLOG_ALL or ATKLOG_ALMOSTALL
 			loglevel = ATKLOG_ALMOSTALL