diff --git a/src/main/java/com/mediamanager/mapper/ArtistMapper.java b/src/main/java/com/mediamanager/mapper/ArtistMapper.java
index 75e6eb1..29f2ce9 100644
--- a/src/main/java/com/mediamanager/mapper/ArtistMapper.java
+++ b/src/main/java/com/mediamanager/mapper/ArtistMapper.java
@@ -10,8 +10,13 @@ public class ArtistMapper {
             return null;
         }
 
+        String name = entity.getName();
+        if (name == null) {
+            throw new IllegalArgumentException("Artist name cannot be null");
+        }
+
         ArtistMessages.Artist.Builder builder = ArtistMessages.Artist.newBuilder()
-                .setName(entity.getName());
+                .setName(name);
 
         // Only set ID when it's present and valid (> 0). Avoids NPE for null IDs.
         Integer id = entity.getId();