diff --git a/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/AmazonS3FileStorageServiceImpl.java b/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/AmazonS3FileStorageServiceImpl.java
index f4758b229c1..56b6a7bd218 100644
--- a/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/AmazonS3FileStorageServiceImpl.java
+++ b/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/AmazonS3FileStorageServiceImpl.java
@@ -101,16 +101,12 @@ public class AmazonS3FileStorageServiceImpl extends BaseFileStorageServiceImpl i
         final PutObjectRequest request = new PutObjectRequest(bucketName.getValue(), key, is, metadata)
                 .withCannedAcl(CannedAccessControlList.PublicRead);
         final AmazonS3Client s3Client = createS3Client();
-
-        new Thread() {
-            public void run() {
-                try {
-                    s3Client.putObject(request);
-                } catch (AmazonClientException e) {
-                    logger.log(Level.WARNING, "Could not store file", e);
-                }
-            };
-        }.run();
+        try {
+            s3Client.putObject(request);
+        } catch (AmazonClientException e) {
+            logger.log(Level.SEVERE, "Could not store file", e);
+            throw new OperationFailedException(e.getMessage(), e);
+        }
         URI uri = getUri(key);
         logger.info("Stored file " + uri);
         return uri;