diff --git a/java/core/src/main/java/co/worklytics/psoxy/gateway/impl/VaultConfigService.java b/java/core/src/main/java/co/worklytics/psoxy/gateway/impl/VaultConfigService.java
index 5f60537c5..94f7217e9 100644
--- a/java/core/src/main/java/co/worklytics/psoxy/gateway/impl/VaultConfigService.java
+++ b/java/core/src/main/java/co/worklytics/psoxy/gateway/impl/VaultConfigService.java
@@ -10,6 +10,7 @@
 import com.bettercloud.vault.response.LogicalResponse;
 import com.bettercloud.vault.response.LookupResponse;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Preconditions;
 import dagger.assisted.Assisted;
 import dagger.assisted.AssistedInject;
 import lombok.Getter;
@@ -129,9 +130,7 @@ public VaultConfigService init() {
     @SneakyThrows
     @Override
     public void putConfigProperty(ConfigProperty property, String value) {
-        if (property.isEnvVarOnly()) {
-            throw new IllegalArgumentException("Can't put env-only config property: " + property);
-        }
+        Preconditions.checkArgument(!property.isEnvVarOnly(), "Can't put env-only config property: " + property);
 
         vault.logical()
             .write(path(property), Map.of(VALUE_FIELD, value));
diff --git a/java/impl/aws/src/main/java/co/worklytics/psoxy/aws/ParameterStoreConfigService.java b/java/impl/aws/src/main/java/co/worklytics/psoxy/aws/ParameterStoreConfigService.java
index b53c7d165..9d8790d8e 100644
--- a/java/impl/aws/src/main/java/co/worklytics/psoxy/aws/ParameterStoreConfigService.java
+++ b/java/impl/aws/src/main/java/co/worklytics/psoxy/aws/ParameterStoreConfigService.java
@@ -73,9 +73,7 @@ public class ParameterStoreConfigService implements SecretStore, LockService {
 
     @Override
     public void putConfigProperty(ConfigProperty property, String value) {
-        if (property.isEnvVarOnly()) {
-            throw new IllegalArgumentException("Can't put env-only config property: " + property);
-        }
+        Preconditions.checkArgument(!property.isEnvVarOnly(), "Can't put env-only config property: " + property);
 
         String key = parameterName(property);
         try {
diff --git a/java/impl/aws/src/main/java/co/worklytics/psoxy/aws/SecretsManagerSecretStore.java b/java/impl/aws/src/main/java/co/worklytics/psoxy/aws/SecretsManagerSecretStore.java
index de27e6d3d..d512dd5a6 100644
--- a/java/impl/aws/src/main/java/co/worklytics/psoxy/aws/SecretsManagerSecretStore.java
+++ b/java/impl/aws/src/main/java/co/worklytics/psoxy/aws/SecretsManagerSecretStore.java
@@ -3,6 +3,7 @@
 import co.worklytics.psoxy.gateway.SecretStore;
 import co.worklytics.psoxy.gateway.impl.EnvVarsConfigService;
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
 import dagger.assisted.Assisted;
 import dagger.assisted.AssistedInject;
 import lombok.Getter;
@@ -48,9 +49,8 @@ public class SecretsManagerSecretStore implements SecretStore {
 
     @Override
     public void putConfigProperty(ConfigProperty property, String value) {
-        if (property.isEnvVarOnly()) {
-            throw new IllegalArgumentException("Can't put env-only config property: " + property);
-        }
+        Preconditions.checkArgument(!property.isEnvVarOnly(), "Can't put env-only config property: " + property);
+
         String id = secretId(property);
         try {
             PutSecretValueRequest request = PutSecretValueRequest.builder()
diff --git a/java/impl/gcp/src/main/java/co/worklytics/psoxy/SecretManagerConfigService.java b/java/impl/gcp/src/main/java/co/worklytics/psoxy/SecretManagerConfigService.java
index 5d1e1724b..c8cfccbfd 100644
--- a/java/impl/gcp/src/main/java/co/worklytics/psoxy/SecretManagerConfigService.java
+++ b/java/impl/gcp/src/main/java/co/worklytics/psoxy/SecretManagerConfigService.java
@@ -61,9 +61,7 @@ public SecretManagerConfigService(@Assisted("projectId") @NonNull String project
 
     @Override
     public void putConfigProperty(ConfigProperty property, String value) {
-        if (property.isEnvVarOnly()) {
-            throw new IllegalArgumentException("Can't put env-only config property: " + property);
-        }
+        Preconditions.checkArgument(!property.isEnvVarOnly(), "Can't put env-only config property: " + property);
 
         String key = parameterName(property);
         SecretName secretName = SecretName.of(projectId, key);