diff --git a/lib/stream/helper/leos3.js b/lib/stream/helper/leos3.js
index cae5380..8304336 100644
--- a/lib/stream/helper/leos3.js
+++ b/lib/stream/helper/leos3.js
@@ -23,13 +23,19 @@ module.exports = function(ls, queue, configure, opts, onFlush) {
 
 	function submitStream(callback) {
 		if (count > 0) {
-			s3.on("finish", (err) => {
-				if (err) {
-					logger.error(err);
-				} else {
+			let called = false;
+			s3.on("error", (err) => {
+				if (!called) {
+					called = true;
+					callback(err);
+				}
+			});
+			s3.on("finish", () => {
+				if (!called) {
+					called = true;
 					logger.debug("UPLOADED FILE");
+					callback();
 				}
-				callback(err);
 			});
 			s3.end();
 		} else {
@@ -72,6 +78,9 @@ module.exports = function(ls, queue, configure, opts, onFlush) {
 
 		logger.info("S3 Location:", newFile);
 		s3 = ls.toS3(configure.resources.LeoS3 || configure.s3, newFile);
+		s3.on('error', (err) => {
+			logger.error("S3 upload error for queue '" + queue + "':", err);
+		});
 		e = {
 			event: queue,
 			start: null,