diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index a8db384657612916937ca185c9fe291fcd1de5aa..e5155938d3346b3d76a9a81257c2d96ba4c1a161 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2911,6 +2911,10 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
             make_ui_sound("UISndTeleportOut");
         }
     }
+    else if (gAgent.getTeleportState() == LLAgent::TELEPORT_MOVING)
+    {
+        LL_WARNS("Messaging") << "Teleport message in the middle of other teleport" << LL_ENDL;
+    }
 	
 	// Teleport is finished; it can't be cancelled now.
 	gViewerWindow->setProgressCancelButtonVisible(FALSE);