diff --git a/src/main/java/com/mediamanager/repository/SamplingRateRepository.java b/src/main/java/com/mediamanager/repository/SamplingRateRepository.java
index e434b9b..4d2fd82 100644
--- a/src/main/java/com/mediamanager/repository/SamplingRateRepository.java
+++ b/src/main/java/com/mediamanager/repository/SamplingRateRepository.java
@@ -53,7 +53,7 @@ public class SamplingRateRepository {
         EntityManager em = entityManagerFactory.createEntityManager();
         try{
             SamplingRate samplingRate = em.find(SamplingRate.class, id);
-            return Optional.of(samplingRate);
+            return Optional.ofNullable(samplingRate);
         }finally {
             if (em.isOpen()) em.close();
         }
diff --git a/src/main/java/com/mediamanager/service/samplingrate/SamplingRateService.java b/src/main/java/com/mediamanager/service/samplingrate/SamplingRateService.java
index 1b9144e..b347815 100644
--- a/src/main/java/com/mediamanager/service/samplingrate/SamplingRateService.java
+++ b/src/main/java/com/mediamanager/service/samplingrate/SamplingRateService.java
@@ -42,7 +42,8 @@ public class SamplingRateService {
     public Optional<SamplingRate> updateSamplingRate(Integer id, String value) {
     logger.info("Updating sampling rate:{}", value);
     if (value == null || value.trim().isEmpty()) {
-    throw new IllegalArgumentException("Sampling-Rate value cannot be null or empty");}
+        throw new IllegalArgumentException("Sampling-Rate value cannot be null or empty");
+    }
     Optional<SamplingRate> existingSamplingRate = repository.findById(id);
     if(existingSamplingRate.isEmpty()) {
         logger.warn("Sampling rate not found with id:{}", id);
@@ -55,6 +56,9 @@ public class SamplingRateService {
     }
 
     public boolean deleteSamplingRate(Integer id) {
+        if (id == null) {
+            throw new IllegalArgumentException("Sampling rate id cannot be null");
+        }
         logger.info("Deleting sampling rate:{}", id);
         return repository.deleteById(id);
     }