Index: runtime/bin/dbg_message.cc |
diff --git a/runtime/bin/dbg_message.cc b/runtime/bin/dbg_message.cc |
index 1d8c22c024ab9475b20c2c5b1a8ecdb81d2cff83..a6358806daca30d265fda87d03c6b66a7fc05656 100644 |
--- a/runtime/bin/dbg_message.cc |
+++ b/runtime/bin/dbg_message.cc |
@@ -1409,14 +1409,15 @@ void DbgMsgQueueList::IsolateEventHandler(Dart_IsolateId isolate_id, |
msg_queue->SendIsolateEvent(isolate_id, kind); |
} else { |
DbgMsgQueue* msg_queue = GetIsolateMsgQueue(isolate_id); |
- ASSERT(msg_queue != NULL); |
- msg_queue->SendQueuedMsgs(); |
- msg_queue->SendIsolateEvent(isolate_id, kind); |
- if (kind == kInterrupted) { |
- msg_queue->MessageLoop(); |
- } else { |
- ASSERT(kind == kShutdown); |
- RemoveIsolateMsgQueue(isolate_id); |
+ if (msg_queue != NULL) { |
+ msg_queue->SendQueuedMsgs(); |
+ msg_queue->SendIsolateEvent(isolate_id, kind); |
+ if (kind == kInterrupted) { |
+ msg_queue->MessageLoop(); |
+ } else { |
+ ASSERT(kind == kShutdown); |
+ RemoveIsolateMsgQueue(isolate_id); |
+ } |
} |
} |
Dart_ExitScope(); |