diff --git a/src/middleware/r2Middleware.ts b/src/middleware/r2Middleware.ts
index a228695..dd6ad8f 100644
--- a/src/middleware/r2Middleware.ts
+++ b/src/middleware/r2Middleware.ts
@@ -124,9 +124,14 @@ async function getFile(
       conditionalHeaders: parseConditionalHeaders(request.headers),
     });
   } catch (err) {
-    // Check if R2 threw a range not compatible error
-    if (err instanceof Error && err.message.includes('10039')) {
-      return new Response(undefined, { status: 416 });
+    if (err instanceof Error) {
+      if (err.message.includes('10020')) {
+        // Object name not valid, url probably has some weirdness in it
+        return new Response(undefined, { status: 400 });
+      } else if (err.message.includes('10039')) {
+        // Range not compatible, probably out of bounds
+        return new Response(undefined, { status: 416 });
+      }
     }
 
     ctx.sentry.captureException(err);