diff --git a/examples/ipv6/rpl-border-router/border-router.c b/examples/ipv6/rpl-border-router/border-router.c
index 915f9c298..cba939212 100644
--- a/examples/ipv6/rpl-border-router/border-router.c
+++ b/examples/ipv6/rpl-border-router/border-router.c
@@ -212,10 +212,11 @@ PROCESS_THREAD(border_router_process, ev, data)
     PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
   }
 
-  rpl_set_root((uip_ip6addr_t *)dag_id);
-  dag = rpl_get_dag(RPL_ANY_INSTANCE);
-  rpl_set_prefix(dag, &prefix, 64);
-  PRINTF("created a new RPL dag\n");
+  dag = rpl_set_root((uip_ip6addr_t *)dag_id);
+  if(dag != NULL) {
+    rpl_set_prefix(dag, &prefix, 64);
+    PRINTF("created a new RPL dag\n");
+  }
 
   print_local_addresses();