diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl
index 68efeea8..0229576e 100644
--- a/ci/input_files/build.yaml.tpl
+++ b/ci/input_files/build.yaml.tpl
@@ -53,7 +53,7 @@ check-layer-size ({{ $runtime.name }}-{{ $runtime.arch }}):
   dependencies:
     - build-layer ({{ $runtime.name }}-{{ $runtime.arch }})
   script: 
-    - PYTHON_VERSION={{ $runtime.python_version }} ./scripts/check_layer_size.sh
+    - PYTHON_VERSION={{ $runtime.python_version }} ARCH={{ $runtime.arch }} ./scripts/check_layer_size.sh
 
 lint python:
   stage: test
diff --git a/scripts/check_layer_size.sh b/scripts/check_layer_size.sh
index f1c8c813..9dbd7e99 100755
--- a/scripts/check_layer_size.sh
+++ b/scripts/check_layer_size.sh
@@ -8,6 +8,7 @@
 # Compares layer size to threshold, and fails if below that threshold
 
 # 7 mb size limit
+set -e
 MAX_LAYER_COMPRESSED_SIZE_KB=$(expr 7 \* 1024)
 MAX_LAYER_UNCOMPRESSED_SIZE_KB=$(expr 24 \* 1024)