diff --git a/core/logic/HandleSys.cpp b/core/logic/HandleSys.cpp
index 851b32450..959473c22 100644
--- a/core/logic/HandleSys.cpp
+++ b/core/logic/HandleSys.cpp
@@ -1173,12 +1173,11 @@ HandleError HandleSystem::GetHandleAccess(Handle_t handle, HandleAccess *&pAcces
 {
 	unsigned int index;
 	QHandle *pHandle;
-	HandleError err;
 	IdentityToken_t *ident = NULL;
+	HandleError err = GetHandle(handle, ident, &pHandle, &index);
 
-	if ((err=GetHandle(handle, ident, &pHandle, &index)) != HandleError_None)
-		return err;
+	if (err == HandleError_None)
+		pAccess = &(pHandle->sec);
 
-	pAccess = &(pHandle->sec);
 	return err;
 }
diff --git a/core/logic/HandleSys.h b/core/logic/HandleSys.h
index 54161e436..f741bd051 100644
--- a/core/logic/HandleSys.h
+++ b/core/logic/HandleSys.h
@@ -278,7 +278,7 @@ public:
 				if ((this->pSecurity->access[HandleAccess_Delete] & HANDLE_RESTRICT_IDENTEXCLUSIVE) == HANDLE_RESTRICT_IDENTEXCLUSIVE)
 					this->pSecurity = nullptr;
 				else
-					pSecurity->access[HandleAccess_Delete] |= HANDLE_RESTRICT_IDENTEXCLUSIVE;
+					this->pSecurity->access[HandleAccess_Delete] |= HANDLE_RESTRICT_IDENTEXCLUSIVE;
 			}
 		}
 	}