diff --git a/pkg/storage/fs/fs.go b/pkg/storage/fs/fs.go
index 475a38470..7b65b3a25 100644
--- a/pkg/storage/fs/fs.go
+++ b/pkg/storage/fs/fs.go
@@ -105,10 +105,24 @@ func (storage *storage) CopyObjectToWriter(w io.Writer, bucket string, object st
 
 	objectPath := path.Join(storage.root, bucket, object)
 
-	file, err := os.Open(objectPath)
-	if err != nil {
-		return 0, mstorage.EmbedError(bucket, object, err)
+	filestat, err := os.Stat(objectPath)
+	switch err := err.(type) {
+	case nil:
+		{
+			if filestat.IsDir() {
+				return 0, mstorage.ObjectNotFound{Bucket: bucket, Object: object}
+			}
+		}
+	default:
+		{
+			if os.IsNotExist(err) {
+				return 0, mstorage.ObjectNotFound{Bucket: bucket, Object: object}
+			} else {
+				return 0, mstorage.EmbedError(bucket, object, err)
+			}
+		}
 	}
+	file, err := os.Open(objectPath)
 	count, err := io.Copy(w, file)
 	if err != nil {
 		return count, mstorage.EmbedError(bucket, object, err)
diff --git a/pkg/storage/storage_api_suite.go b/pkg/storage/storage_api_suite.go
index f25ec33c1..79a5554e2 100644
--- a/pkg/storage/storage_api_suite.go
+++ b/pkg/storage/storage_api_suite.go
@@ -2,7 +2,6 @@ package storage
 
 import (
 	"bytes"
-	"log"
 	"math/rand"
 	"strconv"
 
@@ -20,6 +19,8 @@ func APITestSuite(c *C, create func() Storage) {
 	testListBuckets(c, create)
 	testListBucketsOrder(c, create)
 	testListObjectsTestsForNonExistantBucket(c, create)
+	testNonExistantObjectInBucket(c, create)
+	testGetDirectoryReturnsObjectNotFound(c, create)
 }
 
 func testCreateBucket(c *C, create func() Storage) {
@@ -217,8 +218,72 @@ func testListBucketsOrder(c *C, create func() Storage) {
 func testListObjectsTestsForNonExistantBucket(c *C, create func() Storage) {
 	storage := create()
 	objects, isTruncated, err := storage.ListObjects("bucket", "", 1000)
-	log.Println("EH:", err)
 	c.Assert(err, Not(IsNil))
 	c.Assert(isTruncated, Equals, false)
 	c.Assert(len(objects), Equals, 0)
 }
+
+func testNonExistantObjectInBucket(c *C, create func() Storage) {
+	storage := create()
+	err := storage.StoreBucket("bucket")
+	c.Assert(err, IsNil)
+
+	var byteBuffer bytes.Buffer
+	length, err := storage.CopyObjectToWriter(&byteBuffer, "bucket", "dir1")
+	c.Assert(length, Equals, int64(0))
+	c.Assert(err, Not(IsNil))
+	c.Assert(len(byteBuffer.Bytes()), Equals, 0)
+	switch err := err.(type) {
+	case ObjectNotFound:
+		{
+			c.Assert(err, ErrorMatches, "Object not Found: bucket#dir1")
+		}
+	default:
+		{
+			c.Assert(err, Equals, "fails")
+		}
+	}
+}
+
+func testGetDirectoryReturnsObjectNotFound(c *C, create func() Storage) {
+	storage := create()
+	err := storage.StoreBucket("bucket")
+	c.Assert(err, IsNil)
+
+	err = storage.StoreObject("bucket", "dir1/dir2/object", bytes.NewBufferString("hello world"))
+	c.Assert(err, IsNil)
+
+	var byteBuffer bytes.Buffer
+	length, err := storage.CopyObjectToWriter(&byteBuffer, "bucket", "dir1")
+	c.Assert(length, Equals, int64(0))
+	switch err := err.(type) {
+	case ObjectNotFound:
+		{
+			c.Assert(err.Bucket, Equals, "bucket")
+			c.Assert(err.Object, Equals, "dir1")
+		}
+	default:
+		{
+			// force a failure with a line number
+			c.Assert(err, Equals, "ObjectNotFound")
+		}
+	}
+	c.Assert(len(byteBuffer.Bytes()), Equals, 0)
+
+	var byteBuffer2 bytes.Buffer
+	length, err = storage.CopyObjectToWriter(&byteBuffer, "bucket", "dir1/")
+	c.Assert(length, Equals, int64(0))
+	switch err := err.(type) {
+	case ObjectNotFound:
+		{
+			c.Assert(err.Bucket, Equals, "bucket")
+			c.Assert(err.Object, Equals, "dir1/")
+		}
+	default:
+		{
+			// force a failure with a line number
+			c.Assert(err, Equals, "ObjectNotFound")
+		}
+	}
+	c.Assert(len(byteBuffer2.Bytes()), Equals, 0)
+}