1 files changed, 7 insertions, 1 deletions
diff --git a/core/src/main/java/org/elasticsearch/action/UnavailableShardsException.java b/core/src/main/java/org/elasticsearch/action/UnavailableShardsException.java
index 3534021314..e2cff9244e 100644
--- a/core/src/main/java/org/elasticsearch/action/UnavailableShardsException.java
+++ b/core/src/main/java/org/elasticsearch/action/UnavailableShardsException.java
@@ -36,13 +36,19 @@ public class UnavailableShardsException extends ElasticsearchException {
         super(buildMessage(shardId, message), args);
     }
 
+    public UnavailableShardsException(String index, int shardId, String message, Object... args) {
+        super(buildMessage(index, shardId, message), args);
+    }
+
     private static String buildMessage(ShardId shardId, String message) {
         if (shardId == null) {
             return message;
         }
-        return "[" + shardId.index().name() + "][" + shardId.id() + "] " + message;
+        return buildMessage(shardId.getIndexName(), shardId.id(), message);
     }
 
+    private static String buildMessage(String index, int shardId, String message) {return "[" + index + "][" + shardId + "] " + message;}
+
     public UnavailableShardsException(StreamInput in) throws IOException {
         super(in);
     }