diff --git a/circle.yml b/circle.yml
index e5507a751..df60af089 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,7 +1,7 @@
 dependencies:
     pre:
         - gem install sass --version "= 3.4"
-        - sudo pip install s3cmd
+        - sudo -H pip install s3cmd
         - npm install -g browserify
         - npm install -g grunt-cli
 deployment:
diff --git a/scripts/s3_upload b/scripts/s3_upload
index ea36f424e..50a1c0083 100755
--- a/scripts/s3_upload
+++ b/scripts/s3_upload
@@ -31,10 +31,10 @@ GZIP="--add-header=content-encoding:gzip"
 CMD="sync $SOURCE_DIR $TARGET_DIR -r -P $HEADERS --exclude=*"
 
 echo "Preparing to upload to S3..."
-s3cmd $CMD $GZIP -m 'text/css; charset=utf8'        --include="*.css"
-s3cmd $CMD $GZIP -m 'text/html; charset=utf8'       --include="*.html"
-s3cmd $CMD $GZIP -m 'text/javascript; charset=utf8' --include="*.js"
-s3cmd $CMD $GZIP -m 'application/json'              --include="*.json"
-s3cmd $CMD       -m 'audio/mpeg3'                   --include="*.mp3"
-s3cmd $CMD       -m 'image/png'                     --include="*.png"
+s3cmd $CMD       -m 'image/png'                     --include="*.png"  || exit 1
+s3cmd $CMD $GZIP -m 'application/json'              --include="*.json" || exit 1
+s3cmd $CMD $GZIP -m 'application/octet-stream'      --include="*.ttf"  || exit 1
+s3cmd $CMD $GZIP -m 'text/css; charset=utf8'        --include="*.css"  || exit 1
+s3cmd $CMD $GZIP -m 'text/html; charset=utf8'       --include="*.html" || exit 1
+s3cmd $CMD $GZIP -m 'text/javascript; charset=utf8' --include="*.js"   || exit 1
 echo "S3 Upload Complete"