diff --git a/backend/server.js b/backend/server.js
index 48d6ccfb..fdd71a2f 100644
--- a/backend/server.js
+++ b/backend/server.js
@@ -17,7 +17,7 @@ const app = express();
 const allowedOrigins = ['http://localhost:5173', 'https://github-spy.etlify.app'];
 app.use(cors({
     origin: function (origin, callback) {
-        if (!origin || allowedOrigins.indexOf(origin) !== -1) {
+        if (!origin || allowedOrigins.includes(origin)) {
             callback(null, true);
         } else{
             callback(new Error('Blocked by CORS policy'));
diff --git a/src/components/ActivityFeed.tsx b/src/components/ActivityFeed.tsx
index d770dfee..98e902c7 100644
--- a/src/components/ActivityFeed.tsx
+++ b/src/components/ActivityFeed.tsx
@@ -33,7 +33,8 @@ export default function ActivityFeed({ username }: { username: string }) {
         const res = await fetch(
           `https://api.github.com/users/${username}/events`
         );
-        const data = await res.json();
+        if (!res.ok) throw new Error("Request failed");
+const data = await res.json();
 
         setEvents(data);
         setLoading(false);