diff --git a/src/dawn_wire/server/Server.h b/src/dawn_wire/server/Server.h
index efbb46730a..5e9c8b608a 100644
--- a/src/dawn_wire/server/Server.h
+++ b/src/dawn_wire/server/Server.h
@@ -36,7 +36,7 @@ namespace dawn_wire { namespace server {
         Server* server;
         // TODO(enga): ObjectHandle device;
         // when the wire supports multiple devices.
-        uint32_t requestSerial;
+        uint64_t requestSerial;
     };
 
     struct FenceCompletionUserdata {
diff --git a/src/dawn_wire/server/ServerDevice.cpp b/src/dawn_wire/server/ServerDevice.cpp
index 4e86d3e571..8713b57c27 100644
--- a/src/dawn_wire/server/ServerDevice.cpp
+++ b/src/dawn_wire/server/ServerDevice.cpp
@@ -36,7 +36,11 @@ namespace dawn_wire { namespace server {
         userdata->server = this;
         userdata->requestSerial = requestSerial;
 
-        return mProcs.devicePopErrorScope(cDevice, ForwardPopErrorScope, userdata);
+        bool success = mProcs.devicePopErrorScope(cDevice, ForwardPopErrorScope, userdata);
+        if (!success) {
+            delete userdata;
+        }
+        return success;
     }
 
     // static