Index: modules/CheckEventLog/CheckEventLog.cpp
===================================================================
--- modules/CheckEventLog/CheckEventLog.cpp	(revision 8223547b643d8e8b1ce081a234a46f777b4a8415)
+++ modules/CheckEventLog/CheckEventLog.cpp	(revision 1eef1ee80f5f498f820837fbfdc1d4fbc45853f0)
@@ -296,11 +296,13 @@
 #define BUFFER_SIZE 1024*64
 
-std::string CheckEventLog::handleCommand(const std::string command, const unsigned int argLen, char **char_args) {
+NSCAPI::nagiosReturn CheckEventLog::handleCommand(const std::string command, const unsigned int argLen, char **char_args, std::string &message, std::string &perf) {
 	if (command != "CheckEventLog")
-		return "";
-	NSCAPI::returnCodes rCode = NSCAPI::returnOK;
+		return NSCAPI::returnIgnored;
+	NSCAPI::nagiosReturn rCode = NSCAPI::returnOK;
 	std::list<std::string> args = NSCHelper::arrayBuffer2list(argLen, char_args);
-	if (args.size() < 2)
-		return "Missing argument";
+	if (args.size() < 2) {
+		message = "Missing argument";
+		return NSCAPI::returnCRIT;
+	}
 	std::string ret;
 	bool critical = false;
@@ -310,11 +312,14 @@
 		buildQury(query, args);
 	} catch (std::string s) {
-		return NSCHelper::returnNSCP(NSCAPI::returnUNKNOWN, s);
+		message = s;
+		return NSCAPI::returnCRIT;
 	}
 	NSC_DEBUG_MSG_STD("Base query: " + query.toString());
 
 	HANDLE hLog = OpenEventLog(NULL, logFile.c_str());
-	if (hLog == NULL) 
-		return NSCHelper::returnNSCP(NSCAPI::returnUNKNOWN, "Could not open the Application event log.");
+	if (hLog == NULL) {
+		message = "Could not open the Application event log.";
+		return NSCAPI::returnUNKNOWN;
+	}
 
 	DWORD dwThisRecord, dwRead, dwNeeded;
@@ -403,5 +408,6 @@
 	if (query.truncate != 0)
 		ret = ret.substr(0, query.truncate);
-	return NSCHelper::returnNSCP(rCode, ret);
+	message = ret;
+	return rCode;
 }
 
Index: modules/CheckEventLog/CheckEventLog.h
===================================================================
--- modules/CheckEventLog/CheckEventLog.h	(revision a0528c483134d88636eb730b911145853b46c5af)
+++ modules/CheckEventLog/CheckEventLog.h	(revision 1eef1ee80f5f498f820837fbfdc1d4fbc45853f0)
@@ -14,4 +14,4 @@
 	bool hasCommandHandler();
 	bool hasMessageHandler();
-	std::string handleCommand(const std::string command, const unsigned int argLen, char **args);
+	NSCAPI::nagiosReturn handleCommand(const std::string command, const unsigned int argLen, char **char_args, std::string &message, std::string &perf);
 };