diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java
index 610b452d348bc3278565c46d6d8bd4eb48eb640c..5be39d4f0ae9c5b3255be9782ed1a70ce1316831 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java
@@ -362,7 +362,7 @@ public interface MariaDbMapper {
                                 .append(ck)
                                 .append(")"));
             }
-            if (!data.getDescription().isBlank()) {
+            if (data.getDescription() != null && !data.getDescription().isBlank()) {
                 /* create table comments */
                 stringBuilder.append(" COMMENT \"")
                         .append(data.getDescription())