diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ConfigurationValueDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ConfigurationValueDAOImpl.java
index 298e37b8..b60394cc 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ConfigurationValueDAOImpl.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ConfigurationValueDAOImpl.java
@@ -199,7 +199,9 @@ public class ConfigurationValueDAOImpl implements ConfigurationValueDAO {
 
                                     createNew(data);
                                     return getByProperties(data)
-                                            .orElseThrow();
+                                            .orElseThrow(() -> new ResourceNotFoundException(
+                                                    EntityType.CONFIGURATION_VALUE,
+                                                    String.valueOf(data.attributeId)));
 
                                 });
                     } else {