Changing s3 uploader and fixing NPE