diff --git a/plugins/cdvdGigaherz/src/CDVD.cpp b/plugins/cdvdGigaherz/src/CDVD.cpp
index 4e365ddb80..ee230ea6d9 100644
--- a/plugins/cdvdGigaherz/src/CDVD.cpp
+++ b/plugins/cdvdGigaherz/src/CDVD.cpp
@@ -172,13 +172,13 @@ DWORD CALLBACK keepAliveThread(PVOID param)
 
 s32 StartKeepAliveThread()
 {
-    hNotify_keepAlive = CreateEvent(NULL, FALSE, FALSE, NULL);
-    if (hNotify_keepAlive == INVALID_HANDLE_VALUE)
-        return -1;
+	hNotify_keepAlive = CreateEvent(NULL, FALSE, FALSE, NULL);
+	if (hNotify_keepAlive == nullptr)
+		return -1;
 
 	cdvdKeepAlive_is_open = true;
 	hThread_keepAlive = CreateThread(NULL, 0, keepAliveThread, NULL, 0, &pidThreadKeepAlive);
-	if (hThread_keepAlive == INVALID_HANDLE_VALUE) {
+	if (hThread_keepAlive == nullptr) {
 		cdvdKeepAlive_is_open = false;
 		return -1;
 	}
diff --git a/plugins/cdvdGigaherz/src/ReadThread.cpp b/plugins/cdvdGigaherz/src/ReadThread.cpp
index c16831a90d..b40f98ad98 100644
--- a/plugins/cdvdGigaherz/src/ReadThread.cpp
+++ b/plugins/cdvdGigaherz/src/ReadThread.cpp
@@ -257,17 +257,17 @@ s32 cdvdStartThread()
 	InitializeCriticalSection( &CacheMutex );
 
 	hNotify = CreateEvent(NULL,FALSE,FALSE,NULL);
-	if(hNotify==INVALID_HANDLE_VALUE)
+	if(hNotify == nullptr)
 		return -1;
 
 	hRequestComplete = CreateEvent(NULL,FALSE,FALSE,NULL);
-	if(hRequestComplete==INVALID_HANDLE_VALUE)
+	if(hRequestComplete == nullptr)
 		return -1;
 
 	cdvd_is_open=true;
 	hThread = CreateThread(NULL,0,cdvdThread,NULL,0,&pidThread);
 
-	if(hThread==INVALID_HANDLE_VALUE)
+	if(hThread == nullptr)
 		return -1;
 
 	SetThreadPriority(hThread,THREAD_PRIORITY_NORMAL);