diff --git a/src/p_map.cpp b/src/p_map.cpp
index 66c47dcdae..cd4e30cb66 100644
--- a/src/p_map.cpp
+++ b/src/p_map.cpp
@@ -1561,6 +1561,10 @@ bool P_TestMobjZ (AActor *actor, bool quick, AActor **pOnmobj)
 		{ // Don't clip against self
 			continue;
 		}
+		if ((actor->flags & MF_MISSILE) && thing == actor->target)
+		{ // Don't clip against whoever shot the missile.
+			continue;
+		}
 		if (actor->z > thing->z+thing->height)
 		{ // over thing
 			continue;
diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index fff6daa2a6..90dcda6e84 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -1884,8 +1884,6 @@ fixed_t P_XYMovement (AActor *mo, fixed_t scrollx, fixed_t scrolly)
 						goto explode;
 					}
 
-
-
 					// Reflect the missile along angle
 					mo->angle = angle;
 					angle >>= ANGLETOFINESHIFT;