make s3store a little safer