diff --git a/src/Cedar/Hub.c b/src/Cedar/Hub.c
index 4af7debb..1fb6b458 100644
--- a/src/Cedar/Hub.c
+++ b/src/Cedar/Hub.c
@@ -3700,7 +3700,7 @@ bool HubPaPutPacket(SESSION *s, void *data, UINT size)
 	pa->Now = Tick64();
 
 	// Processing of Adjust TCP MSS
-	if (hub->Option != NULL && hub->Option->DisableAdjustTcpMss == false && s != NULL)
+	if (hub != NULL && hub->Option != NULL && hub->Option->DisableAdjustTcpMss == false && s != NULL)
 	{
 		UINT target_mss = (hub->Option->AdjustTcpMssValue == 0 ? INFINITE : hub->Option->AdjustTcpMssValue);
 		UINT session_mss = (s->AdjustMss == 0 ? INFINITE : s->AdjustMss);
diff --git a/src/Cedar/IPsec_EtherIP.c b/src/Cedar/IPsec_EtherIP.c
index 41d11630..e91bd15d 100644
--- a/src/Cedar/IPsec_EtherIP.c
+++ b/src/Cedar/IPsec_EtherIP.c
@@ -541,16 +541,8 @@ UINT CalcEtherIPTcpMss(ETHERIP_SERVER *s)
 		}
 	}
 
-	if (s->L2TPv3 == false)
-	{
-		// EtherIP
-		ret -= 2;
-	}
-	else
-	{
-		// L2TPv3
-		ret -= 2;
-	}
+	// EtherIP, L2TPv3
+	ret -= 2;
 
 	// Ethernet
 	ret -= 14;
diff --git a/src/Cedar/Interop_OpenVPN.c b/src/Cedar/Interop_OpenVPN.c
index 854e1ba0..9343d9d1 100644
--- a/src/Cedar/Interop_OpenVPN.c
+++ b/src/Cedar/Interop_OpenVPN.c
@@ -1661,10 +1661,7 @@ OPENVPN_PACKET *OvsParsePacket(UCHAR *data, UINT size)
 
 LABEL_ERROR:
 	Debug("OvsParsePacket Error.\n");
-	if (ret != NULL)
-	{
-		OvsFreePacket(ret);
-	}
+	OvsFreePacket(ret);
 	return NULL;
 }