diff --git a/[refs] b/[refs]
index 013fcbf189b5..330eeb191788 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 402196724816875d382099bedb09fdf1f57845bc
+refs/heads/master: bb899b89f46eb1fd6f62a4c360f6511b9714e479
diff --git a/trunk/net/batman-adv/routing.c b/trunk/net/batman-adv/routing.c
index 90ae6f0c30f3..368ceeba8145 100644
--- a/trunk/net/batman-adv/routing.c
+++ b/trunk/net/batman-adv/routing.c
@@ -108,7 +108,7 @@ static void update_route(struct bat_priv *bat_priv, struct orig_node *orig_node,
 				    tt_buff, tt_buff_len);
 
 	/* route changed */
-	} else {
+	} else if (neigh_node && curr_router) {
 		bat_dbg(DBG_ROUTES, bat_priv,
 			"Changing route towards: %pM "
 			"(now via %pM - was via %pM)\n",