diff --git a/src/main/java/com/mediamanager/mapper/GenreMapper.java b/src/main/java/com/mediamanager/mapper/GenreMapper.java
index ceae850..331e67c 100644
--- a/src/main/java/com/mediamanager/mapper/GenreMapper.java
+++ b/src/main/java/com/mediamanager/mapper/GenreMapper.java
@@ -9,10 +9,16 @@ public class GenreMapper {
             return null;
         }
 
-        return GenreMessages.Genre.newBuilder()
-                .setId(entity.getId())
-                .setName(entity.getName())
-                .build();
+        GenreMessages.Genre.Builder builder = GenreMessages.Genre.newBuilder()
+                .setName(entity.getName());
+
+        // Only set ID when it's present and valid (> 0). Avoids NPE for null IDs.
+        Integer id = entity.getId();
+        if (id != null && id > 0) {
+            builder.setId(id);
+        }
+
+        return builder.build();
     }
     public static Genre toEntity(GenreMessages.Genre protobuf) {
         if (protobuf == null) {
diff --git a/src/main/java/com/mediamanager/service/ipc/IPCManager.java b/src/main/java/com/mediamanager/service/ipc/IPCManager.java
index 2115066..7fe7541 100644
--- a/src/main/java/com/mediamanager/service/ipc/IPCManager.java
+++ b/src/main/java/com/mediamanager/service/ipc/IPCManager.java
@@ -125,7 +125,7 @@ public class IPCManager {
         }
 
 
-        logger.info("Closing IPC connection...");
+          logger.info("Closing IPC connection...");
 
         running.set(false);
         if (serverChannel != null && serverChannel.isOpen()) {