@@ -11,6 +11,7 @@
 import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.jedis.exceptions.JedisDataException;
 import redis.clients.jedis.exceptions.JedisMovedDataException;
+import redis.clients.jedis.exceptions.JedisNoScriptException;
 import redis.clients.util.RedisInputStream;
 import redis.clients.util.RedisOutputStream;
 import redis.clients.util.SafeEncoder;
@@ -21,6 +22,7 @@ public final class Protocol {
   private static final String MOVED_RESPONSE = "MOVED";
   private static final String CLUSTERDOWN_RESPONSE = "CLUSTERDOWN";
   private static final String BUSY_RESPONSE = "BUSY";
+  private static final String NOSCRIPT_RESPONSE = "NOSCRIPT";
 
   public static final String DEFAULT_HOST = "localhost";
   public static final int DEFAULT_PORT = 6379;
@@ -119,6 +121,8 @@ private static void processError(final RedisInputStream is) {
       throw new JedisClusterException(message);
     } else if (message.startsWith(BUSY_RESPONSE)) {
       throw new JedisBusyException(message);
+    } else if (message.startsWith(NOSCRIPT_RESPONSE) ) {
+      throw new JedisNoScriptException(message);
     }
     throw new JedisDataException(message);
   }
 
@@ -0,0 +1,11 @@
+package redis.clients.jedis.exceptions;
+
+public class JedisNoScriptException extends JedisDataException  {
+  private static final long serialVersionUID = 4674378093072060731L;
+
+  public JedisNoScriptException(final String message) { super(message); }
+
+  public JedisNoScriptException(final Throwable cause) { super(cause); }
+
+  public JedisNoScriptException(final String message, final Throwable cause) { super(message, cause); }
+}
@@ -17,6 +17,7 @@
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.jedis.exceptions.JedisDataException;
+import redis.clients.jedis.exceptions.JedisNoScriptException;
 import redis.clients.jedis.tests.utils.ClientKillerUtil;
 import redis.clients.util.SafeEncoder;
 
@@ -127,7 +128,7 @@ public void evalsha() {
     assertEquals("bar", result);
   }
 
-  @Test(expected = JedisDataException.class)
+  @Test(expected = JedisNoScriptException.class)
   public void evalshaShaNotFound() {
     jedis.evalsha("ffffffffffffffffffffffffffffffffffffffff");
   }
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`import redis.clients.jedis.Jedis;`
`18`	`18`	`import redis.clients.jedis.exceptions.JedisConnectionException;`
`19`	`19`	`import redis.clients.jedis.exceptions.JedisDataException;`
	`20`	`+import redis.clients.jedis.exceptions.JedisNoScriptException;`
`20`	`21`	`import redis.clients.jedis.tests.utils.ClientKillerUtil;`
`21`	`22`	`import redis.clients.util.SafeEncoder;`
`22`	`23`
`@@ -127,7 +128,7 @@ public void evalsha() {`
`127`	`128`	`assertEquals("bar", result);`
`128`	`129`	`}`
`129`	`130`
`130`		`- @Test(expected = JedisDataException.class)`
	`131`	`+ @Test(expected = JedisNoScriptException.class)`
`131`	`132`	`public void evalshaShaNotFound() {`
`132`	`133`	`jedis.evalsha("ffffffffffffffffffffffffffffffffffffffff");`
`133`	`134`	`}`