diff --git a/src/main/java/net/onrc/onos/core/topology/TopologyManager.java b/src/main/java/net/onrc/onos/core/topology/TopologyManager.java
index 343102b..78b6b9f 100644
--- a/src/main/java/net/onrc/onos/core/topology/TopologyManager.java
+++ b/src/main/java/net/onrc/onos/core/topology/TopologyManager.java
@@ -167,17 +167,19 @@
             //
             // The main loop
             //
-            try {
-                while (true) {
-                    EventEntry<TopologyEvent> eventEntry = topologyEvents.take();
+            while (true) {
+                try {
+                    EventEntry<TopologyEvent> eventEntry =
+                        topologyEvents.take();
                     collection.add(eventEntry);
                     topologyEvents.drainTo(collection);
 
                     processEvents(collection);
                     collection.clear();
+                } catch (Exception exception) {
+                    log.debug("Exception processing Topology Events: ",
+                              exception);
                 }
-            } catch (Exception exception) {
-                log.debug("Exception processing Topology Events: ", exception);
             }
         }