diff --git a/services/blob/src/http/context.rs b/services/blob/src/http/context.rs
index a6534fdcb..403a95d83 100644
--- a/services/blob/src/http/context.rs
+++ b/services/blob/src/http/context.rs
@@ -1,72 +1,86 @@
 use crate::database::ReverseIndexItem;
 use crate::database::{BlobItem, DatabaseClient, Error as DBError};
-use crate::s3::{S3Client, S3Path};
+use crate::s3::{Error as S3Error, S3Client, S3Path};
 use actix_web::error::{
-  ErrorInternalServerError, ErrorNotFound, ErrorServiceUnavailable,
+  ErrorBadRequest, ErrorInternalServerError, ErrorNotFound,
+  ErrorServiceUnavailable,
 };
 use actix_web::Error as HttpError;
 use anyhow::Result;
 use aws_sdk_dynamodb::Error as DynamoDBError;
 use tracing::{debug, error, warn};
 
 /// This structure is passed to every HTTP request handler
 /// It should be cloneable because each HTTP worker thread receives a copy
 #[derive(Clone)]
 pub struct AppContext {
   pub db: DatabaseClient,
   pub s3: S3Client,
 }
 
 impl AppContext {
   pub async fn find_s3_path_by_reverse_index(
     &self,
     reverse_index_item: &ReverseIndexItem,
   ) -> Result<S3Path, HttpError> {
     let blob_hash = &reverse_index_item.blob_hash;
     match self.db.find_blob_item(&blob_hash).await {
       Ok(Some(BlobItem { s3_path, .. })) => Ok(s3_path),
       Ok(None) => {
         debug!("No blob found for {:?}", reverse_index_item);
         Err(ErrorNotFound("blob not found"))
       }
       Err(err) => Err(handle_db_error(err)),
     }
   }
 
   pub async fn find_s3_path_by_holder(
     &self,
     holder: &str,
   ) -> Result<S3Path, HttpError> {
     match self.db.find_reverse_index_by_holder(holder).await {
       Ok(Some(reverse_index)) => {
         self.find_s3_path_by_reverse_index(&reverse_index).await
       }
       Ok(None) => {
         debug!("No db entry found for holder {:?}", holder);
         Err(ErrorNotFound("blob not found"))
       }
       Err(err) => Err(handle_db_error(err)),
     }
   }
 }
 
 pub fn handle_db_error(db_error: DBError) -> HttpError {
   match db_error {
     DBError::AwsSdk(DynamoDBError::InternalServerError(_))
     | DBError::AwsSdk(DynamoDBError::ProvisionedThroughputExceededException(
       _,
     ))
     | DBError::AwsSdk(DynamoDBError::RequestLimitExceeded(_)) => {
       warn!("AWS transient error occurred");
       ErrorServiceUnavailable("please retry")
     }
     DBError::Blob(blob_err) => {
       error!("Encountered Blob database error: {}", blob_err);
       ErrorInternalServerError("Internal error")
     }
     err => {
       error!("Encountered an unexpected error: {}", err);
       ErrorInternalServerError("unexpected error")
     }
   }
 }
+
+pub fn handle_s3_error(s3_error: S3Error) -> HttpError {
+  match s3_error {
+    S3Error::EmptyUpload => {
+      warn!("Empty upload. Aborting");
+      ErrorBadRequest("Empty upload")
+    }
+    err => {
+      error!("Encountered S3 error: {:?}", err);
+      ErrorInternalServerError("Internal error")
+    }
+  }
+}
diff --git a/services/blob/src/http/handlers/blob.rs b/services/blob/src/http/handlers/blob.rs
index 00cd1ed79..9039c515a 100644
--- a/services/blob/src/http/handlers/blob.rs
+++ b/services/blob/src/http/handlers/blob.rs
@@ -1,299 +1,294 @@
 use crate::constants::{
   BLOB_DOWNLOAD_CHUNK_SIZE, S3_MULTIPART_UPLOAD_MINIMUM_CHUNK_SIZE,
 };
 use crate::database::{BlobItem, ReverseIndexItem};
+use crate::http::context::handle_s3_error;
 use crate::tools::MemOps;
 
 use super::{handle_db_error, AppContext};
 use actix_web::error::{
   ErrorBadRequest, ErrorConflict, ErrorInternalServerError, ErrorNotFound,
 };
 use actix_web::{web, Error as HttpError, HttpResponse};
 use anyhow::Result;
 use async_stream::{try_stream, AsyncStream};
 use serde::{Deserialize, Serialize};
 use tokio_stream::StreamExt;
 use tracing::{debug, error, info, instrument, trace, warn};
 use tracing_futures::Instrument;
 
 #[instrument(
   name = "get_blob",
   skip_all,
   fields(holder = %params.as_ref().as_str(), s3_path))
 ]
 pub async fn get_blob_handler(
   ctx: web::Data<AppContext>,
   params: web::Path<String>,
 ) -> actix_web::Result<HttpResponse> {
   info!("Get blob request");
   let holder = params.into_inner();
   let s3_path = ctx.find_s3_path_by_holder(&holder).await?;
   tracing::Span::current().record("s3_path", s3_path.to_full_path());
 
-  let object_metadata =
-    ctx.s3.get_object_metadata(&s3_path).await.map_err(|err| {
-      error!("Failed to get S3 object metadata: {:?}", err);
-      ErrorInternalServerError("server error")
-    })?;
+  let object_metadata = ctx
+    .s3
+    .get_object_metadata(&s3_path)
+    .await
+    .map_err(handle_s3_error)?;
   let file_size: u64 =
     object_metadata.content_length().try_into().map_err(|err| {
       error!("Failed to get S3 object content length: {:?}", err);
       ErrorInternalServerError("server error")
     })?;
 
   // Stream the data in chunks to avoid loading the whole file into memory.
   let chunk_size: u64 = BLOB_DOWNLOAD_CHUNK_SIZE;
 
   let s3 = ctx.s3.clone();
 
   let stream: AsyncStream<Result<web::Bytes, HttpError>, _> = try_stream! {
     let mut offset: u64 = 0;
     while offset < file_size {
       let next_size = std::cmp::min(chunk_size, file_size - offset);
       let range = offset..(offset + next_size);
       trace!(?range, "Getting {} bytes of data", next_size);
 
-      let data = s3.get_object_bytes(&s3_path, range).await.map_err(|err| {
-        error!("Failed to download data chunk: {:?}", err);
-        ErrorInternalServerError("download failed")
-      })?;
+      let data = s3.get_object_bytes(&s3_path, range).await.map_err(handle_s3_error)?;
       yield web::Bytes::from(data);
 
       offset += chunk_size;
     }
   };
 
   Ok(
     HttpResponse::Ok()
       .content_type("application/octet-stream")
       .append_header(("Content-Length", file_size.to_string()))
       .streaming(Box::pin(stream.in_current_span())),
   )
 }
 
 #[derive(Deserialize, Debug)]
 pub struct AssignHolderPayload {
   holder: String,
   blob_hash: String,
 }
 
 #[derive(Serialize)]
 struct AssignHolderResponnse {
   data_exists: bool,
 }
 
 #[instrument(name = "assign_holder", skip(ctx))]
 pub async fn assign_holder_handler(
   ctx: web::Data<AppContext>,
   payload: web::Json<AssignHolderPayload>,
 ) -> actix_web::Result<HttpResponse> {
   info!("Assign holder request");
   let AssignHolderPayload { holder, blob_hash } = payload.into_inner();
 
   if ctx
     .db
     .find_reverse_index_by_holder(&holder)
     .await
     .map_err(handle_db_error)?
     .is_some()
   {
     warn!("holder already assigned");
     return Err(ErrorConflict("holder already assigned"));
   }
 
   let data_exists = ctx
     .db
     .find_blob_item(&blob_hash)
     .await
     .map_err(handle_db_error)?
     .is_some();
   debug!(data_exists, "Checked blob item existence");
 
   let reverse_index_item = ReverseIndexItem { holder, blob_hash };
   ctx
     .db
     .put_reverse_index_item(reverse_index_item)
     .await
     .map_err(handle_db_error)?;
 
   Ok(HttpResponse::Ok().json(web::Json(AssignHolderResponnse { data_exists })))
 }
 
 async fn get_blob_hash_field(
   multipart_payload: &mut actix_multipart::Multipart,
 ) -> Result<String, HttpError> {
   let Some(mut field) = multipart_payload.try_next().await? else {
     debug!("Malfolmed multipart request");
     return Err(ErrorBadRequest("Bad request"));
   };
 
   if field.name() != "blob_hash" {
     warn!("Blob hash is required as a first form field");
     return Err(ErrorBadRequest("Bad request"));
   }
 
   let mut buf = Vec::new();
   while let Some(chunk) = field.try_next().await? {
     buf.extend_from_slice(&chunk);
   }
 
   let blob_hash = String::from_utf8(buf)
     .map_err(|_| ErrorInternalServerError("Internal error"))?;
   return Ok(blob_hash);
 }
 
 async fn process_blob_data(
   multipart_payload: &mut actix_multipart::Multipart,
   upload_session: &mut crate::s3::MultiPartUploadSession,
 ) -> Result<(), HttpError> {
   let mut s3_chunk: Vec<u8> = Vec::new();
   while let Some(mut field) = multipart_payload.try_next().await? {
     let field_name = field.name();
     if field_name != "blob_data" {
       warn!(
         field_name,
         "Malfolmed request: 'blob_data' multipart field expected."
       );
       return Err(ErrorBadRequest("Bad request"));
     }
 
     while let Some(chunk) = field.try_next().await? {
       let mut chunk = chunk.to_vec();
       s3_chunk.append(&mut chunk);
 
       // New parts should be added to AWS only if they exceed minimum part size,
       // Otherwise AWS returns error
       if s3_chunk.len() as u64 > S3_MULTIPART_UPLOAD_MINIMUM_CHUNK_SIZE {
         trace!(
           chunk_size = s3_chunk.len(),
           "Chunk size exceeded, adding new S3 part"
         );
-        if let Err(err) = upload_session.add_part(s3_chunk.take_out()).await {
-          error!("Failed to upload S3 part: {:?}", err);
-          return Err(ErrorInternalServerError("Internal error"));
-        }
+        upload_session
+          .add_part(s3_chunk.take_out())
+          .await
+          .map_err(handle_s3_error)?;
       }
     }
   }
 
   // add the remaining data as the last S3 part
   if !s3_chunk.is_empty() {
-    if let Err(err) = upload_session.add_part(s3_chunk).await {
-      error!("Failed to upload final part: {:?}", err);
-      return Err(ErrorInternalServerError("Internal error"));
-    }
+    upload_session
+      .add_part(s3_chunk)
+      .await
+      .map_err(handle_s3_error)?;
   }
 
   Ok(())
 }
 
 #[instrument(skip_all, name = "upload_blob", fields(blob_hash))]
 pub async fn upload_blob_handler(
   ctx: web::Data<AppContext>,
   mut payload: actix_multipart::Multipart,
 ) -> actix_web::Result<HttpResponse> {
   info!("Upload blob request");
 
   let blob_hash = get_blob_hash_field(&mut payload).await?;
   debug!("Received blob_hash: {}", &blob_hash);
   tracing::Span::current().record("blob_hash", &blob_hash);
 
   if ctx
     .db
     .find_blob_item(&blob_hash)
     .await
     .map_err(handle_db_error)?
     .is_some()
   {
     warn!("Blob with given hash already exists");
     return Err(ErrorConflict("Conflict"));
   }
 
   let blob_item = BlobItem::new(blob_hash);
   let mut upload_session = ctx
     .s3
     .start_upload_session(&blob_item.s3_path)
     .await
-    .map_err(|err| {
-      error!("Failed to start S3 upload session: {:?}", err);
-      ErrorInternalServerError("Internal error")
-    })?;
+    .map_err(handle_s3_error)?;
 
   trace!("Receiving blob data");
   process_blob_data(&mut payload, &mut upload_session).await?;
 
-  // TODO: Handle "No parts to upload" as HTTP 400
-  if let Err(err) = upload_session.finish_upload().await {
-    error!("Failed to finish upload session: {:?}", err);
-    return Err(ErrorInternalServerError("Internal error"));
-  }
+  upload_session
+    .finish_upload()
+    .await
+    .map_err(handle_s3_error)?;
 
   trace!("Upload finished, saving blob item to DB: {:?}", &blob_item);
   ctx
     .db
     .put_blob_item(blob_item)
     .await
     .map_err(handle_db_error)?;
 
   Ok(HttpResponse::NoContent().finish())
 }
 
 #[instrument(
   name = "delete_blob",
   skip_all,
   fields(holder = %params.as_ref().as_str()))
 ]
 pub async fn delete_blob_handler(
   ctx: web::Data<AppContext>,
   params: web::Path<String>,
 ) -> actix_web::Result<HttpResponse> {
   info!("Delete blob request");
   let holder = params.into_inner();
   let reverse_index_item = ctx
     .db
     .find_reverse_index_by_holder(&holder)
     .await
     .map_err(handle_db_error)?
     .ok_or_else(|| {
       debug!("Blob not found");
       ErrorNotFound("Blob not found")
     })?;
   let blob_hash = &reverse_index_item.blob_hash;
 
   ctx
     .db
     .remove_reverse_index_item(&holder)
     .await
     .map_err(handle_db_error)?;
 
   // TODO: handle cleanup here properly
   // for now the object's being removed right away
   // after the last holder was removed
   if ctx
     .db
     .find_reverse_index_by_hash(blob_hash)
     .await
     .map_err(handle_db_error)?
     .is_empty()
   {
     let s3_path = ctx
       .find_s3_path_by_reverse_index(&reverse_index_item)
       .await?;
     debug!("Last holder removed. Deleting S3 object: {:?}", &s3_path);
 
-    ctx.s3.delete_object(&s3_path).await.map_err(|e| {
-      error!("Failed to delete S3 object: {:?}", e);
-      ErrorInternalServerError("server error")
-    })?;
+    ctx
+      .s3
+      .delete_object(&s3_path)
+      .await
+      .map_err(handle_s3_error)?;
 
     ctx
       .db
       .remove_blob_item(blob_hash)
       .await
       .map_err(handle_db_error)?;
   } else {
     debug!("Blob still has holders, S3 object not deleted");
   }
 
   Ok(HttpResponse::NoContent().finish())
 }