From d3dcbae9cafe5d9cdeae9210b6db6f873e8f914c Mon Sep 17 00:00:00 2001
From: greenboxal2 <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 21 Jun 2012 16:10:13 +0000
Subject: [PATCH] Follow up r16327 missing null pointer check on mercenary
 data.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16328 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/unit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/map/unit.c b/src/map/unit.c
index e85849283b..319b2a40d7 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -194,7 +194,7 @@ static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data
 				unit_warp( &sd->md->bl, sd->bl.m, sd->bl.x, sd->bl.y, CLR_TELEPORT );
 			}
 		}
-		else
+		else if( sd->md )
 		{
 			// reset the tick, he is not far anymore
 			sd->md->masterteleport_timer = 0;