diff --git a/opp/core/src/main/java/OperationServiceImpl.java b/opp/core/src/main/java/OperationServiceImpl.java
index 5d21f74ba4f29e6a3c918ed538fefa95dfbb6689..41a3bc5d1fdcf8d3c332d7f50139b18e2b92443f 100644
--- a/opp/core/src/main/java/OperationServiceImpl.java
+++ b/opp/core/src/main/java/OperationServiceImpl.java
@@ -75,6 +75,10 @@ public class OperationServiceImpl implements OperationService {
 
     public Operation delete(Operation.Delete del) throws Exception {
 
-        return repo.deleteOperation(del.id());
+        Optional<Operation> foundOperation =  repo.findOperation(del.id());
+        if (foundOperation.isPresent()) {
+            return repo.deleteOperation(del.id());
+        }
+        return null;
     }
 }
diff --git a/opp/jdbc-repo-impl/src/test/java/Tests.java b/opp/jdbc-repo-impl/src/test/java/Tests.java
index 90b8b9fdeda7eb34530ab0b35cf96d96433c50af..67a6005a79a8ac0e3bc6bd91261d9a40bbc11900 100644
--- a/opp/jdbc-repo-impl/src/test/java/Tests.java
+++ b/opp/jdbc-repo-impl/src/test/java/Tests.java
@@ -342,6 +342,7 @@ public final class Tests
       throw new Exception();
     }
   }
+
 @Ignore
   @Test
   public void testDeleteOperation() throws Exception {
@@ -355,7 +356,7 @@ public final class Tests
 
     Operation deleteOperation = operationService.process(deleteCommand);
 
-    assertFalse(repo.findOperation(deleteOperation.id()).isPresent());
+   assertFalse(repo.findOperation(deleteOperation.id()).isPresent());
   }
 
   @Ignore