diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index b743b589..4db8e2ed 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -133,10 +133,11 @@
 /mob/living/carbon/proc/swap_hand()
 	var/obj/item/item_in_hand = src.get_active_hand()
 	if(item_in_hand) //this segment checks if the item in your hand is twohanded.
-		if(istype(item_in_hand,/obj/item/weapon/twohanded))
+		if(istype(item_in_hand,/obj/item/weapon/twohanded) || istype(item_in_hand,/obj/item/weapon/gun))
 			if(item_in_hand:wielded == 1)
 				usr << "<span class='warning'>Your other hand is too busy holding the [item_in_hand.name]</span>"
 				return
+
 	src.hand = !( src.hand )
 	if(hud_used.l_hand_hud_object && hud_used.r_hand_hud_object)
 		if(hand)	//This being 1 means the left hand is in use
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index ee846224..89608e7e 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -387,8 +387,8 @@
 				user << "<span class='notice'>You are no-longer stabilizing the [name] with both hands.</span>"
 				O.unwield()
 				unwield()
-				if(src)
-					del(src)
+		if(src)
+			del(src)
 
 /obj/item/weapon/gun/offhand/mob_can_equip(M as mob, slot)
 	return 0 //Because you can't equip your hand yet somehow you can
\ No newline at end of file
diff --git a/html/changelog.html b/html/changelog.html
index 8a1da820..49df3ce8 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -57,11 +57,12 @@ should be listed in the changelog upon commit though. Thanks. -->
 <!-- DO NOT REMOVE, MOVE, OR COPY THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# -->
 
 <div class='commit sansserif'>
-	<h2 class='date'>10 January 2015</h2>
+	<h2 class='date'>15 January 2015</h2>
 	<h3 class='author'>SoundScopes updated:</h3>
 	<ul class='changes bgimages16'>
 		<li class='rscadd'>Playing cards to custom loadout</li>
 		<li class='rscadd'>Mutany Gamemode</li>
+		<li class='bugfix'>Offhand sprite icon should no longer stay around if your hand is broken</li>
 		<li class='bugfix'>Vox know Basic when spawning in heist rounds</li>
 		<li class='bugfix'>IPC's are now unaffected by changeling stings</li>
 		<li class='bugfix'>Stamps work on clipboards</li>