diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index 8f157872624..dd47f3f2efe 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -198,6 +198,7 @@
 				var/mob/living/M = src.loc
 				var/count = 0
 				while(!istype(M, /mob/living))
+					if(!M || !M.loc) return 0 //For a runtime where M ends up in nullspace (similar to bluespace but less colourful)
 					M = M.loc
 					count++
 					if(count >= 6)
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 1fd264d4c62..1540b5e9931 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -105,6 +105,10 @@
 
 /obj/item/weapon/gun/projectile/russian/attack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj)
 
+	if(!loaded.len)
+		user.visible_message("\red *click*", "\red *click*")
+		return
+
 	if(isliving(target) && isliving(user))
 		if(target == user)
 			var/datum/organ/external/affecting = user.zone_sel.selecting
diff --git a/html/changelog.html b/html/changelog.html
index 3367e4c4e19..e20e30cb57d 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -34,7 +34,7 @@
 	<tr>
 		<td valign='top'>
 			<font size='2'><b>Coders:</b> TLE, NEO, Errorage, muskets, veryinky, Skie, Noise, Numbers, Agouri, Noka, Urist McDorf, Uhangi, Darem, Mport, rastaf0, Doohl, Superxpdude, Rockdtben, ConstantA, Petethegoat, Kor, Polymorph, Carn, Nodrak, Donkie, Sieve, Giacom, trubble_bass.<br></font>
-			<font size='2'><b>Spriters:</b> Agouri, Cheridan, Cruazy Guest, Deeaych, Deuryn, Matty406, Microwave, ShiftyEyesShady, Skie, Uhangi, Veyveyr, Petethegoat, Kor, Ricotez, Ausops, TankNut<br></font>
+			<font size='2'><b>Spriters:</b> Agouri, Cheridan, Cruazy Guest, Deeaych, Deuryn, Matty406, Microwave, ShiftyEyesShady, Skie, Uhangi, Veyveyr, Petethegoat, Kor, Ricotez, Ausops, TankNut, Pewtershmitz<br></font>
 			<font size='2'><b>Sounds:</b> Skie, Lasty/Vinyl<br></font>
 			<font size='2'><b>Thanks to:</b> Baystation 12, CDK Station devs, GoonStation devs, the original SpaceStation developers and Invisty for the title image<br></font>
 			<font size='2' color='red'><b><br>Have a bug to report?</b> Visit our <a href="http://code.google.com/p/tgstation13/issues/list">Issue Tracker</a>.<br></font>