diff --git a/Assets/Scripts/Behaviours/Ped/States/BaseAimMovementState.cs b/Assets/Scripts/Behaviours/Ped/States/BaseAimMovementState.cs
index 3024355c..29c182fd 100644
--- a/Assets/Scripts/Behaviours/Ped/States/BaseAimMovementState.cs
+++ b/Assets/Scripts/Behaviours/Ped/States/BaseAimMovementState.cs
@@ -467,7 +467,7 @@ namespace SanAndreasUnity.Behaviours.Peds.States
 			Vector3 castDir = -m_ped.Camera.transform.forward;
 
 			// use distance from gun aiming offset ?
-			if (m_ped.CurrentWeapon.GunAimingOffset != null)
+			if (m_ped.CurrentWeapon != null && m_ped.CurrentWeapon.GunAimingOffset != null)
 			{
 			//	Vector3 desiredCameraPos = this.transform.TransformPoint (- _player.CurrentWeapon.GunAimingOffset.Aim) + Vector3.up * .5f;
 			//	Vector3 desiredCameraPos = this.transform.TransformPoint( new Vector3(0.8f, 1.0f, -1) );
diff --git a/Docs/Multiplayer.md b/Docs/Multiplayer.md
index 45d3c672..ad32e21a 100644
--- a/Docs/Multiplayer.md
+++ b/Docs/Multiplayer.md
@@ -8,7 +8,7 @@
 
 - adapt states: 
 
-- send button input events to server: crouch, 
+- send button input events to server: 
 
 - stats window