diff --git a/FileUtils.cpp b/FileUtils.cpp
index d497a20b..4da8392b 100644
--- a/FileUtils.cpp
+++ b/FileUtils.cpp
@@ -100,7 +100,7 @@ bool CFile::FType(const CString sFileName, EFileTypes eType, bool bUseLstat) {
 		case FT_SOCK:
 			return S_ISSOCK(st.st_mode);
 		default:
-			return false;
+			break;
 	}
 	return false;
 }
diff --git a/IRCSock.cpp b/IRCSock.cpp
index b2f0583c..064c79a6 100644
--- a/IRCSock.cpp
+++ b/IRCSock.cpp
@@ -182,7 +182,6 @@ void CIRCSock::ReadLine(const CString& sData) {
 				case 432: // :irc.server.com 432 * nick :Erroneous Nickname: Illegal characters
 				case 433: {
 					CString sBadNick = sRest.Token(0);
-					CString sConfNick = m_pUser->GetNick().Left(GetMaxNickLen());
 
 					if (!m_bAuthed) {
 						SendAltNick(sBadNick);
@@ -681,11 +680,10 @@ bool CIRCSock::OnPrivCTCP(CNick& Nick, CString& sMessage) {
 		}
 
 		return true;
-	} else {
-		return OnGeneralCTCP(Nick, sMessage);
 	}
 
-	return false;
+	// This handles everything which wasn't handled yet
+	return OnGeneralCTCP(Nick, sMessage);
 }
 
 bool CIRCSock::OnGeneralCTCP(CNick& Nick, CString& sMessage) {
diff --git a/Utils.cpp b/Utils.cpp
index 994b0096..f75a8a6d 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -155,8 +155,6 @@ CString CUtils::GetHashPass() {
 			return pass1.MD5();
 		}
 	}
-
-	return "";
 }
 
 CString CUtils::GetSaltedHashPass(CString& sSalt) {
@@ -175,8 +173,6 @@ CString CUtils::GetSaltedHashPass(CString& sSalt) {
 			return SaltedHash(pass1, sSalt);
 		}
 	}
-
-	return "";
 }
 
 CString CUtils::GetSalt() {