diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
index 5cfe4f090dfabd831df60a5b173aa8bb21513b3e..c4f502236253db5c3463ab6ae66be4f66dd26b9e 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -977,6 +977,7 @@ public class Controller implements IFloodlightProviderService,
                     }
                     else {
                         logError(sw, error);
+
                         // allow registered listeners to receive error messages
                         shouldHandleMessage = true;
                     }
diff --git a/src/main/java/net/floodlightcontroller/core/internal/OFSwitchImpl.java b/src/main/java/net/floodlightcontroller/core/internal/OFSwitchImpl.java
index fd6339338ccee39470298b0253de7f4d18bf4311..a3809a1b80e7cfbc6b1e2f86d880ff95e3a37a35 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/OFSwitchImpl.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/OFSwitchImpl.java
@@ -50,6 +50,4 @@ public class OFSwitchImpl extends OFSwitchBase {
     public List<Short> getUplinkPorts() {
         return null;
     }
-
-     
 }
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
index 1d11ac6c3eaba013295154d8bccfb6ef76710799..9ded18add8aa7c949d03c7e0f32d39fa66c942cd 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -558,8 +558,8 @@ public class LinkDiscoveryManager implements IOFMessageListener,
         }
 
         if (isLinkDiscoverySuppressed(sw, port)) {
-            /*
-             * Dont send LLDPs out of this port as suppressLLDPs set
+            /* Dont send LLDPs out of this port as suppressLLDPs set
+             * 
              */
             return;
         }