diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ScannerInstanceResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ScannerInstanceResource.java
index 951cafc8632a..28ba60fa19b7 100644
--- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ScannerInstanceResource.java
+++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ScannerInstanceResource.java
@@ -161,6 +161,11 @@ public Response getBinary(final @Context UriInfo uriInfo) {
     }
     servlet.getMetrics().incrementRequests(1);
     try {
+      if (generator == null) {
+        servlet.getMetrics().incrementFailedGetRequests(1);
+        return Response.status(Response.Status.NOT_FOUND).type(MIMETYPE_TEXT)
+          .entity("Not found" + CRLF).build();
+      }
       Cell value = generator.next();
       if (value == null) {
         if (LOG.isTraceEnabled()) {
@@ -199,6 +204,11 @@ public Response delete(final @Context UriInfo uriInfo) {
       return Response.status(Response.Status.FORBIDDEN).type(MIMETYPE_TEXT)
         .entity("Forbidden" + CRLF).build();
     }
+    if (generator == null) {
+      servlet.getMetrics().incrementFailedDeleteRequests(1);
+      return Response.status(Response.Status.NOT_FOUND).type(MIMETYPE_TEXT)
+        .entity("Not found" + CRLF).build();
+    }
     if (ScannerResource.delete(id)) {
       servlet.getMetrics().incrementSucessfulDeleteRequests(1);
     } else {
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java
index c5da2f6e4ffd..4ebfce0b5089 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java
@@ -387,4 +387,9 @@ public void testTableScanWithTableDisable() throws IOException {
     assertTrue("got " + response.getCode(), response.getCode() == 410);
   }
 
+  @Test
+  public void deleteNonExistent() throws IOException {
+    Response response = client.delete("/" + TABLE + "/scanner/NONEXISTENT_SCAN");
+    assertEquals(404, response.getCode());
+  }
 }