diff --git a/src/Cedar/Admin.c b/src/Cedar/Admin.c
index 0173afd6..07addc8c 100644
--- a/src/Cedar/Admin.c
+++ b/src/Cedar/Admin.c
@@ -410,11 +410,12 @@ PACK *AdminDispatch(RPC *rpc, char *name, PACK *p)
 
 	server = a->Server;
 
-	if (server != NULL)
+	if (server == NULL)
 	{
-		cedar = server->Cedar;
+		return NULL;
 	}
 
+	cedar = server->Cedar;
 	Lock(cedar->CedarSuperLock);
 
 	if (true)
diff --git a/src/Cedar/Protocol.c b/src/Cedar/Protocol.c
index 9a59bf18..501b7eff 100644
--- a/src/Cedar/Protocol.c
+++ b/src/Cedar/Protocol.c
@@ -6652,7 +6652,10 @@ SOCK *SocksConnectEx2(CONNECTION *c, char *proxy_host_name, UINT proxy_port,
 	if (c == NULL || proxy_host_name == NULL || proxy_port == 0 || server_host_name == NULL
 		|| server_port == 0)
 	{
-		c->Err = ERR_PROXY_CONNECT_FAILED;
+		if (c != NULL)
+		{
+			c->Err = ERR_PROXY_CONNECT_FAILED;
+		}
 		return NULL;
 	}
 
@@ -6846,7 +6849,10 @@ SOCK *ProxyConnectEx2(CONNECTION *c, char *proxy_host_name, UINT proxy_port,
 	if (c == NULL || proxy_host_name == NULL || proxy_port == 0 || server_host_name == NULL ||
 		server_port == 0)
 	{
-		c->Err = ERR_PROXY_CONNECT_FAILED;
+		if( c != NULL)
+		{
+			c->Err = ERR_PROXY_CONNECT_FAILED;
+		}
 		return NULL;
 	}
 	if (username != NULL && password != NULL &&
diff --git a/src/Cedar/WebUI.c b/src/Cedar/WebUI.c
index 3edbe90c..3d8b575a 100644
--- a/src/Cedar/WebUI.c
+++ b/src/Cedar/WebUI.c
@@ -326,7 +326,7 @@ static wchar_t *WpListener(WEBUI *wu, LIST *params)
 	WU_CONTEXT *context = WuGetContext(wu->Contexts, sessionkey);
 	char *cmd = (char*)StrMapSearch(params, "CMD");
 	RPC_LISTENER t;
-	UINT retcode;
+	UINT retcode = ERR_NO_ERROR;
 
 	if(context == NULL)
 	{
diff --git a/src/Mayaqua/Cfg.c b/src/Mayaqua/Cfg.c
index 5805fd7f..801ea340 100644
--- a/src/Mayaqua/Cfg.c
+++ b/src/Mayaqua/Cfg.c
@@ -2338,6 +2338,11 @@ void CfgDeleteFolder(FOLDER *f)
 		return;
 	}
 
+	if(f->Folders == NULL)
+	{
+		return;
+	}
+
 	// Remove all subfolders
 	num = LIST_NUM(f->Folders);
 	ff = Malloc(sizeof(FOLDER *) * num);
diff --git a/src/Mayaqua/Encrypt.c b/src/Mayaqua/Encrypt.c
index 389267b0..e6a8f806 100644
--- a/src/Mayaqua/Encrypt.c
+++ b/src/Mayaqua/Encrypt.c
@@ -4424,7 +4424,7 @@ void DesEcbEncrypt(void *dst, void *src, void *key_7bytes)
 	DES_cblock key;
 	DES_key_schedule ks;
 	// Validate arguments
-	if (dst == NULL || src == NULL || key == NULL)
+	if (dst == NULL || src == NULL || key_7bytes == NULL)
 	{
 		return;
 	}
diff --git a/src/Mayaqua/Internat.c b/src/Mayaqua/Internat.c
index 69b10439..95ad6ea9 100644
--- a/src/Mayaqua/Internat.c
+++ b/src/Mayaqua/Internat.c
@@ -2038,7 +2038,7 @@ UINT Utf8ToUni(wchar_t *s, UINT size, BYTE *u, UINT u_size)
 	while (true)
 	{
 		UINT type;
-		wchar_t c;
+		wchar_t c = 0;
 		BYTE c1, c2;
 
 		type = GetUtf8Type(u, u_size, i);
@@ -2063,8 +2063,6 @@ UINT Utf8ToUni(wchar_t *s, UINT size, BYTE *u, UINT u_size)
 		}
 		i += type;
 
-		c = 0;
-
 		if (IsBigEndian())
 		{
 			if (sizeof(wchar_t) == 2)
diff --git a/src/Mayaqua/Network.c b/src/Mayaqua/Network.c
index 5eaf3d9a..6c2098ed 100644
--- a/src/Mayaqua/Network.c
+++ b/src/Mayaqua/Network.c
@@ -2659,7 +2659,7 @@ void RUDPBulkSend(RUDP_STACK *r, RUDP_SESSION *se, void *data, UINT data_size)
 	CRYPT *c;
 	UCHAR crypt_key_src[SHA1_SIZE * 2];
 	UCHAR crypt_key[SHA1_SIZE];
-	UINT icmp_type;
+	UINT icmp_type = 0;
 	UCHAR sign[SHA1_SIZE];
 	UCHAR iv[SHA1_SIZE + 1];
 	// Validate arguments
@@ -13512,7 +13512,7 @@ UINT SecureRecv(SOCK *sock, void *data, UINT size)
 UINT SecureSend(SOCK *sock, void *data, UINT size)
 {
 	SOCKET s;
-	int ret, e;
+	int ret, e = SSL_ERROR_NONE;
 	SSL *ssl;
 	s = sock->socket;
 	ssl = sock->ssl;