diff --git a/src/event/Queue.cpp b/src/event/Queue.cpp
index 03bb4db..baafcaf 100644
--- a/src/event/Queue.cpp
+++ b/src/event/Queue.cpp
@@ -60,11 +60,13 @@ void ResetSyncState(EvtContext* context) {
 }
 
 void UpdateSyncState(EvtContext* context, EVENTID& id, const void* data) {
+    STORM_VALIDATE_BEGIN;
+    STORM_VALIDATE(context);
+    STORM_VALIDATE_END_VOID;
+
     KEY key;
     MOUSEBUTTON button;
 
-    STORM_ASSERT(context);
-
     switch (id) {
     case EVENT_ID_FOCUS:
         ResetSyncState(context);
@@ -145,7 +147,9 @@ void IEvtQueueRegister(EvtContext* context, EVENTID id, int32_t (*handler)(const
 }
 
 int32_t IEvtQueueCheckSyncKeyState(EvtContext* context, KEY key) {
-    STORM_VALIDATE(context, ERROR_INVALID_PARAMETER, 0);
+    STORM_VALIDATE_BEGIN;
+    STORM_VALIDATE(context);
+    STORM_VALIDATE_END;
 
     context->m_critsect.Enter();