diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
index 3dbfa0dac6770042ad0138db79ca3946af8b9aa8..93fb9364b761b769c8743f70a81b2740a0df2734 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -572,6 +572,8 @@ public class Controller
                         handleMessage(sw, m, null);
                         break;
                 }
+            } catch (Exception e) {
+                log.warn("Exeption in handling OF message {}", e);
             }
             finally {
                 sw.processMessageLock().unlock();
@@ -1219,6 +1221,8 @@ public class Controller
                 }
             }
             switchResultSet.save();
+        } catch (Exception e) {
+            log.error("Error updating switch info {}", e);
         }
         finally {
             if (switchResultSet != null)