diff --git a/fiat-roles/src/main/java/com/netflix/spinnaker/fiat/providers/BaseProvider.java b/fiat-roles/src/main/java/com/netflix/spinnaker/fiat/providers/BaseProvider.java
index 0677dc3b9..25f4e34ff 100644
--- a/fiat-roles/src/main/java/com/netflix/spinnaker/fiat/providers/BaseProvider.java
+++ b/fiat-roles/src/main/java/com/netflix/spinnaker/fiat/providers/BaseProvider.java
@@ -72,7 +72,7 @@ public Set<R> getAll() throws ProviderException {
     try {
       return ImmutableSet.copyOf(cache.get(CACHE_KEY, this::loadAll));
     } catch (ExecutionException | UncheckedExecutionException e) {
-      throw new ProviderException(e.getCause());
+      throw new ProviderException(this.getClass(), e.getCause());
     }
   }
 
diff --git a/fiat-roles/src/main/java/com/netflix/spinnaker/fiat/providers/ProviderException.java b/fiat-roles/src/main/java/com/netflix/spinnaker/fiat/providers/ProviderException.java
index c4a0a89d6..06b9140d7 100644
--- a/fiat-roles/src/main/java/com/netflix/spinnaker/fiat/providers/ProviderException.java
+++ b/fiat-roles/src/main/java/com/netflix/spinnaker/fiat/providers/ProviderException.java
@@ -18,22 +18,15 @@
 
 public class ProviderException extends RuntimeException {
 
-  public ProviderException() {
-  }
-
-  public ProviderException(String message) {
-    super(message);
-  }
-
-  public ProviderException(String message, Throwable cause) {
-    super(message, cause);
-  }
+  private Class provider;
 
-  public ProviderException(Throwable cause) {
+  public ProviderException(Class provider, Throwable cause) {
     super(cause);
+    this.provider = provider;
   }
 
-  public ProviderException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-    super(message, cause, enableSuppression, writableStackTrace);
+  @Override
+  public String getMessage() {
+    return "(Provider: " + provider.getSimpleName() + ") " + super.getMessage();
   }
 }