diff --git a/src/v1/game/controllers/game.controller.ts b/src/v1/game/controllers/game.controller.ts
index 7cb1dbe..78c17af 100644
--- a/src/v1/game/controllers/game.controller.ts
+++ b/src/v1/game/controllers/game.controller.ts
@@ -13,10 +13,13 @@ export class GameController {
 
   @Post('create')
   async createAndSave(@Body() createGameDto: CreateGameDto): Promise<Game> {
-    const user = await this.userRepository.findOneByIntraIdOrFail(
-      createGameDto.intraId,
-    );
+    const user = await this.userRepository.findOneBy({
+      intraId: createGameDto.intraId,
+    });
 
+    if (!user) {
+      throw new Error('User not found');
+    }
     return await this.gameService.createAndSave(createGameDto, user);
   }
 }
diff --git a/src/v1/game/dto/create-game.dto.ts b/src/v1/game/dto/create-game.dto.ts
index ebf107b..21afc30 100644
--- a/src/v1/game/dto/create-game.dto.ts
+++ b/src/v1/game/dto/create-game.dto.ts
@@ -1,4 +1,10 @@
-import { IsNotEmpty, IsNumber, IsString } from 'class-validator';
+import {
+  IsBoolean,
+  IsDate,
+  IsNotEmpty,
+  IsNumber,
+  IsString,
+} from 'class-validator';
 
 export class CreateGameDto {
   @IsNotEmpty()
diff --git a/src/v1/users/domain/repositories/user.repository.ts b/src/v1/users/domain/repositories/user.repository.ts
index fc935da..0e34854 100644
--- a/src/v1/users/domain/repositories/user.repository.ts
+++ b/src/v1/users/domain/repositories/user.repository.ts
@@ -1,6 +1,6 @@
 import { Repository, DataSource } from 'typeorm';
 import { User } from '../models/user.entity';
-import { Injectable, NotFoundException } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { CreateUserDto } from '../../dto/create-user.dto';
 
 @Injectable()
@@ -18,16 +18,7 @@ export class UserRepository extends Repository<User> {
       return await this.findOneBy({ intraId });
     } catch (err) {
       console.error(err);
-      throw new Error(err);
-    }
-  }
-
-  async findOneByIntraIdOrFail(intraId: string): Promise<User> {
-    try {
-      return await this.findOneByOrFail({ intraId });
-    } catch (err) {
-      console.error(err);
-      throw new NotFoundException('Failed to find user by intraId');
+      throw new Error('Failed to find user by intraId');
     }
   }
 }