diff --git a/builtin/providers/aws/data_source_aws_s3_bucket_object.go b/builtin/providers/aws/data_source_aws_s3_bucket_object.go
index 6091999381..2eff5e6dab 100644
--- a/builtin/providers/aws/data_source_aws_s3_bucket_object.go
+++ b/builtin/providers/aws/data_source_aws_s3_bucket_object.go
@@ -132,7 +132,7 @@ func dataSourceAwsS3BucketObjectRead(d *schema.ResourceData, meta interface{}) e
 	log.Printf("[DEBUG] Reading S3 object: %s", input)
 	out, err := conn.HeadObject(&input)
 	if err != nil {
-		return fmt.Errorf("Failed getting S3 object: %s", err)
+		return fmt.Errorf("Failed getting S3 object: %s Bucket: %q Object: %q", err, bucket, key)
 	}
 	if out.DeleteMarker != nil && *out.DeleteMarker == true {
 		return fmt.Errorf("Requested S3 object %q%s has been deleted",