diff --git a/EarlGrey/Core/GREYElementInteraction.m b/EarlGrey/Core/GREYElementInteraction.m
index 3d889c6d7..19e7d7ceb 100644
--- a/EarlGrey/Core/GREYElementInteraction.m
+++ b/EarlGrey/Core/GREYElementInteraction.m
@@ -714,10 +714,10 @@ - (BOOL)grey_handleFailureOfAction:(id<GREYAction>)action
                      [GREYError grey_nestedDescriptionForError:actionError]);
   } else {
     if ([actionError isKindOfClass:[GREYError class]]) {
-      NSMutableDictionary *errorDetails = [[NSMutableDictionary alloc] init];
-      errorDetails[kErrorDetailActionNameKey] = action.name;
+      GREYError *greyError = (GREYError *)actionError;
+      NSMutableDictionary *errorDetails = [[NSMutableDictionary alloc] initWithDictionary:greyError.errorInfo];
       errorDetails[kErrorDetailElementMatcherKey] = _elementMatcher.description;
-      [(GREYError *)actionError setErrorInfo:errorDetails];
+      [greyError setErrorInfo:errorDetails];
     }
     *userProvidedError = actionError;
   }
@@ -896,10 +896,10 @@ - (BOOL)grey_handleFailureOfAssertion:(id<GREYAssertion>)assertion
                         [GREYError grey_nestedDescriptionForError:assertionError]);
   } else {
     if ([assertionError isKindOfClass:[GREYError class]]) {
-      NSMutableDictionary *errorDetails = [[NSMutableDictionary alloc] init];
-      errorDetails[kErrorDetailActionNameKey] = assertion.name;
+      GREYError *greyError = (GREYError *)assertionError;
+      NSMutableDictionary *errorDetails = [[NSMutableDictionary alloc] initWithDictionary:greyError.errorInfo];
       errorDetails[kErrorDetailElementMatcherKey] = _elementMatcher.description;
-      [(GREYError *)assertionError setErrorInfo:errorDetails];
+      [greyError setErrorInfo:errorDetails];
     }
     *userProvidedError = assertionError;
   }