diff --git a/src/main/java/com/navi/infra/portal/dto/VaultResponse.java b/src/main/java/com/navi/infra/portal/dto/VaultResponse.java
index b0365797..015e96c9 100644
--- a/src/main/java/com/navi/infra/portal/dto/VaultResponse.java
+++ b/src/main/java/com/navi/infra/portal/dto/VaultResponse.java
@@ -19,4 +19,8 @@ public class VaultResponse implements Serializable {
     private int httpStatus;
 
     private String responseBody;
+
+    public Boolean isOk() {
+        return httpStatus == 200;
+    }
 }
diff --git a/src/main/java/com/navi/infra/portal/service/ManifestService.java b/src/main/java/com/navi/infra/portal/service/ManifestService.java
index f71b6434..39748c0d 100644
--- a/src/main/java/com/navi/infra/portal/service/ManifestService.java
+++ b/src/main/java/com/navi/infra/portal/service/ManifestService.java
@@ -26,8 +26,10 @@ import org.springframework.http.HttpStatus;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.server.ResponseStatusException;
 
+
 @Service
 @RequiredArgsConstructor
 @Slf4j
@@ -44,6 +46,7 @@ public class ManifestService {
     private final KubernetesManifestService kubernetesManifestService;
 
     @PreAuthorize("hasAuthority('manifest.write')")
+    @Transactional
     public ManifestResponse createOrUpdate(JsonNode manifestRequest) {
         ManifestResponse manifestResponse = new ManifestResponse();
         Set<ValidationMessage> validationReport = validationUtils.getReport(manifestRequest);
@@ -167,12 +170,18 @@ public class ManifestService {
 
         if (manifest.hasSecrets() && AuthorizationContext.hasAuthority("secret.read")) {
             VaultResponse vaultResponse = vaultService.fetchConfig(manifest.getSecretVaultPath());
+            if(!vaultResponse.isOk()) {
+                throw new RuntimeException(String.format("Unable to fetch secrets from vault, HTTP STATUS: %s", vaultResponse.getHttpStatus()));
+            }
             manifestDeepCopy.addSecrets(vaultResponse.getData());
         }
 
         if (manifest.hasSuperSecrets() && AuthorizationContext.hasAuthority("supersecret.read")) {
             VaultResponse vaultResponse = vaultService
                 .fetchConfig(manifest.getSuperSecretVaultPath());
+            if(!vaultResponse.isOk()) {
+                throw new RuntimeException(String.format("Unable to fetch super secrets from vault, HTTP STATUS: %s", vaultResponse.getHttpStatus()));
+            }
             manifestDeepCopy.addSuperSecrets(vaultResponse.getData());
         }
         return manifestDeepCopy;