diff --git a/src/nu/nucontmgr.c b/src/nu/nucontmgr.c
index e418001..0a4a93a 100644
--- a/src/nu/nucontmgr.c
+++ b/src/nu/nucontmgr.c
@@ -63,17 +63,17 @@ s32 nuContReadDataImpl(OSContPad* data, u32 flags) {
     return 0;
 }
 
-s32 nuContQueryImpl(void) {
-    s32 var_v0;
+s32 nuContQueryImpl(NUSiCommonMesg* mesg) {
+    s32 ret = osContStartQuery(&nuSiMesgQ);
 
-    var_v0 = osContStartQuery(&nuSiMesgQ);
-    if (var_v0 == 0) {
-        osRecvMesg(&nuSiMesgQ, NULL, OS_MESG_BLOCK);
-        osContGetQuery(nuContStatus);
-        return 0;
-    } else {
-        return var_v0;
+    if (ret != 0) {
+        return ret;
     }
+
+    osRecvMesg(&nuSiMesgQ, NULL, OS_MESG_BLOCK);
+    osContGetQuery(nuContStatus);
+
+    return ret;
 }
 
 s32 nuContRetraceImpl(NUSiCommonMesg* mesg) {