diff --git a/src/workerd/api/global-scope.c++ b/src/workerd/api/global-scope.c++
index cfee90347901..cc12a31f92f7 100644
--- a/src/workerd/api/global-scope.c++
+++ b/src/workerd/api/global-scope.c++
@@ -884,16 +884,19 @@ double Performance::now() {
 }
 
 #ifdef WORKERD_EXPERIMENTAL_ENABLE_WEBGPU
-jsg::Ref<api::gpu::GPU> Navigator::getGPU(CompatibilityFlags::Reader flags) {
+jsg::Optional<jsg::Ref<api::gpu::GPU>> Navigator::getGPU(CompatibilityFlags::Reader flags) {
   // is this a durable object?
   KJ_IF_SOME(actor, IoContext::current().getActor()) {
-    JSG_REQUIRE(actor.getPersistent() != kj::none, TypeError,
-        "webgpu api is only available in Durable Objects (no storage)");
+    if (actor.getPersistent() == kj::none) {
+      return kj::none;
+    }
   } else {
-    JSG_FAIL_REQUIRE(TypeError, "webgpu api is only available in Durable Objects");
+    return kj::none;
   };
 
-  JSG_REQUIRE(flags.getWebgpu(), TypeError, "webgpu needs the webgpu compatibility flag set");
+  if (!flags.getWebgpu()) {
+    return kj::none;
+  }
 
   return jsg::alloc<api::gpu::GPU>();
 }
diff --git a/src/workerd/api/global-scope.h b/src/workerd/api/global-scope.h
index a8ed3f5f5655..c39961e4e2c7 100644
--- a/src/workerd/api/global-scope.h
+++ b/src/workerd/api/global-scope.h
@@ -74,7 +74,7 @@ class Navigator: public jsg::Object {
     return "Cloudflare-Workers"_kj;
   }
 #ifdef WORKERD_EXPERIMENTAL_ENABLE_WEBGPU
-  jsg::Ref<api::gpu::GPU> getGPU(CompatibilityFlags::Reader flags);
+  jsg::Optional<jsg::Ref<api::gpu::GPU>> getGPU(CompatibilityFlags::Reader flags);
 #endif
 
   bool sendBeacon(jsg::Lock& js, kj::String url, jsg::Optional<Body::Initializer> body);
diff --git a/src/workerd/api/tests/global-scope-test.js b/src/workerd/api/tests/global-scope-test.js
index 3fa2884b7ec4..f837ecbaecd5 100644
--- a/src/workerd/api/tests/global-scope-test.js
+++ b/src/workerd/api/tests/global-scope-test.js
@@ -2,11 +2,13 @@ import {
   deepStrictEqual,
   strictEqual,
   throws,
+  doesNotThrow,
   notStrictEqual,
   ok,
 } from 'node:assert';
 
 import { AsyncLocalStorage } from 'node:async_hooks';
+import util from 'node:util';
 
 export const navigatorUserAgent = {
   async test() {
@@ -744,3 +746,12 @@ export const toStringTag = {
     strictEqual(new Headers()[internalFlag], internalFlag);
   },
 };
+
+export const validateGlobalThis = {
+  test() {
+    doesNotThrow(
+      () => util.inspect(globalThis),
+      "globalThis shouldn't fail to be inspected."
+    );
+  },
+};