diff --git a/src/main/java/com/eactive/testmaster/server/mapper/ServerMapper.java b/src/main/java/com/eactive/testmaster/server/mapper/ServerMapper.java
index 9b8a636..02b0f8a 100644
--- a/src/main/java/com/eactive/testmaster/server/mapper/ServerMapper.java
+++ b/src/main/java/com/eactive/testmaster/server/mapper/ServerMapper.java
@@ -7,6 +7,7 @@ import com.eactive.testmaster.server.dto.ServerOptionDTO;
 import com.eactive.testmaster.server.entity.Server;
 import com.eactive.testmaster.server.entity.ServerOption;
 import com.eactive.testmaster.server.repository.ServerRepository;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -76,14 +77,14 @@ public class ServerMapper {
     }
     public List<ServerOption> mapOptions(List<ServerOptionDTO> dtos) {
         if (dtos == null) {
-            return null;
+            return new ArrayList<>();
         }
         return dtos.stream().map(this::map).filter(Objects::nonNull).collect(Collectors.toList());
     }
 
     public List<ServerOptionDTO> mapOptionsDTO(List<ServerOption> entities) {
         if (entities == null) {
-            return null;
+            return new ArrayList<>();
         }
         return entities.stream().map(this::map).filter(Objects::nonNull).collect(Collectors.toList());
     }
diff --git a/src/main/java/com/eactive/testmaster/server/service/ServerMgmtService.java b/src/main/java/com/eactive/testmaster/server/service/ServerMgmtService.java
index 943d60d..f6f1867 100644
--- a/src/main/java/com/eactive/testmaster/server/service/ServerMgmtService.java
+++ b/src/main/java/com/eactive/testmaster/server/service/ServerMgmtService.java
@@ -26,10 +26,12 @@ public class ServerMgmtService {
     }
 
     public void create(Server server) {
-        server.getServerOptions().forEach(serverOption -> {
-            serverOption.setEnabled(true);
-            serverOption.setServer(server);
-        });
+        if (server.getServerOptions()!=null){
+            server.getServerOptions().forEach(serverOption -> {
+                serverOption.setEnabled(true);
+                serverOption.setServer(server);
+            });
+        }
         serverRepository.save(server);
     }