diff --git a/Chan.cpp b/Chan.cpp
index 49ad6529..2cbe8a36 100644
--- a/Chan.cpp
+++ b/Chan.cpp
@@ -187,12 +187,13 @@ void CChan::OnWho(const CString& sNick, const CString& sIdent, const CString& sH
 }
 
 void CChan::ModeChange(const CString& sModes, const CString& sOpNick) {
-	CNick* pOpNick = FindNick(sOpNick);
 	CString sModeArg = sModes.Token(0);
 	CString sArgs = sModes.Token(1, true);
 	bool bAdd = true;
 
 #ifdef _MODULES
+	CNick* pOpNick = FindNick(sOpNick);
+
 	if (pOpNick) {
 		VOIDMODULECALL(OnRawMode(*pOpNick, *this, sModeArg, sArgs));
 	}
@@ -210,7 +211,6 @@ void CChan::ModeChange(const CString& sModes, const CString& sOpNick) {
 			CNick* pNick = FindNick(sArg);
 			if (pNick) {
 				unsigned char uPerm = m_pUser->GetIRCSock()->GetPermFromMode(uMode);
-				bool bNoChange = (pNick->HasPerm(uPerm) == bAdd);
 
 				if (uPerm) {
 					if (bAdd) {
@@ -231,6 +231,7 @@ void CChan::ModeChange(const CString& sModes, const CString& sOpNick) {
 						}
 					}
 #ifdef _MODULES
+					bool bNoChange = (pNick->HasPerm(uPerm) == bAdd);
 
 					if (uMode && pOpNick) {
 						VOIDMODULECALL(OnChanPermission(*pOpNick, *pNick, *this, uMode, bAdd, bNoChange));
diff --git a/Client.cpp b/Client.cpp
index bfb2f737..5c091a4b 100644
--- a/Client.cpp
+++ b/Client.cpp
@@ -132,9 +132,11 @@ void CClient::ReadLine(const CString& sData) {
 
 			for (unsigned int a = 0; a < vChans.size(); a++) {
 				CString sChannel = vChans[a];
+#ifdef _MODULES
 				CZNC::Get().GetModules().SetClient(this);
 				MODULECALLCONT(OnUserJoin(sChannel, sKey));
 				CZNC::Get().GetModules().SetClient(NULL);
+#endif
 
 				CChan* pChan = m_pUser->FindChan(sChannel);
 
@@ -166,9 +168,11 @@ void CClient::ReadLine(const CString& sData) {
 			sMessage.LeftChomp();
 		}
 
+#ifdef _MODULES
 		CZNC::Get().GetModules().SetClient(this);
 		MODULECALLRET(OnUserPart(sChan, sMessage));
 		CZNC::Get().GetModules().SetClient(NULL);
+#endif
 
 		if (m_pUser) {
 			CChan* pChan = m_pUser->FindChan(sChan);
@@ -1210,9 +1214,11 @@ void CClient::AuthUser() {
 
 		SendMotd();
 
+#ifdef _MODULES
 		CZNC::Get().GetModules().SetClient(this);
 		VOIDMODULECALL(OnUserAttached());
 		CZNC::Get().GetModules().SetClient(NULL);
+#endif
 	}
 }
 
@@ -1231,9 +1237,11 @@ void CClient::Disconnected() {
 		m_pIRCSock = NULL;
 	}
 
+#ifdef _MODULES
 	CZNC::Get().GetModules().SetClient(this);
 	VOIDMODULECALL(OnUserDetached());
 	CZNC::Get().GetModules().SetClient(NULL);
+#endif
 }
 
 void CClient::IRCConnected(CIRCSock* pIRCSock) {