diff --git a/src/main/java/net/floodlightcontroller/core/internal/OFChannelHandler.java b/src/main/java/net/floodlightcontroller/core/internal/OFChannelHandler.java
index 485e83627f8c2068984a426dfd3557b173bbe2bf..667ae245ff239e046d80a3b03efc23509748f044 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/OFChannelHandler.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/OFChannelHandler.java
@@ -729,7 +729,7 @@ class OFChannelHandler extends IdleStateAwareChannelHandler {
 			log.warn("Could not process message: queue full");
 			counters.rejectedExecutionException.increment();
 		} else if (e.getCause() instanceof IllegalArgumentException) {
-			log.error("Could not decode OpenFlow protocol version from switch {}. Perhaps the switch is trying to use SSL and the controller is not (or vice versa)? {}", getConnectionInfoString(), e.getCause());
+			log.error("Illegal argument exception with switch {}. {}", getConnectionInfoString(), e.getCause());
 			counters.switchSslConfigurationError.increment();
 			ctx.getChannel().close();
 		} else {
diff --git a/src/main/java/net/floodlightcontroller/core/internal/OFSwitchHandshakeHandler.java b/src/main/java/net/floodlightcontroller/core/internal/OFSwitchHandshakeHandler.java
index 6eccbe07234812e0ccc04c248363fc7ffcbeaa6f..05e56c5f47e1f9b082f66321e16092f70b4eb6f6 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/OFSwitchHandshakeHandler.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/OFSwitchHandshakeHandler.java
@@ -527,7 +527,7 @@ public class OFSwitchHandshakeHandler implements IOFConnectionListener {
 			for (int tableId = 0; tableId < this.sw.getMaxTableForTableMissFlow().getValue(); tableId++) {
 				/* Only add the flow if the table exists and if it supports sending to the controller */
 				TableFeatures tf = this.sw.getTableFeatures(TableId.of(tableId));
-				if (tf != null /* TODO && tf.supportsSendingToController() -- we need something like this, but how? */) {
+				if (/* TODO tf != null*/ true /* TODO && tf.supportsSendingToController() -- we need something like this, but how? */) {
 					OFFlowAdd defaultFlow = this.factory.buildFlowAdd()
 							.setTableId(TableId.of(tableId))
 							.setPriority(0)