diff --git a/src/main/java/com/example/domain/user/service/UserService.java b/src/main/java/com/example/domain/user/service/UserService.java
index 84218cb..b330437 100644
--- a/src/main/java/com/example/domain/user/service/UserService.java
+++ b/src/main/java/com/example/domain/user/service/UserService.java
@@ -13,6 +13,7 @@
 import org.springframework.web.server.ResponseStatusException;
 
 import java.util.List;
+import java.util.Optional;
 
 @Service
 @RequiredArgsConstructor
@@ -30,10 +31,15 @@ public List<UserDto> getUsers() {
 
     public void createUser(CreateUserDto createUserDto) {
         if(isUserExist(createUserDto.getUsername())) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Username already exists");
+
         User user = User.builder()
-                .name(createUserDto.getUsername())
+                .name(Optional.ofNullable(createUserDto.getUsername()).orElseThrow(
+                        () -> new ResponseStatusException(HttpStatus.BAD_REQUEST, "Username is required"
+                )))
                 .password(
-                        passwordEncoder.encode(createUserDto.getPassword())
+                        passwordEncoder.encode(Optional.ofNullable(createUserDto.getPassword()).orElseThrow(
+                                () -> new ResponseStatusException(HttpStatus.BAD_REQUEST, "Password is required"
+                        )))
                 )
                 .build();
         userRepository.save(user);